diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-10-13 13:24:50 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-10-14 10:57:25 +0000 |
| commit | af3d4809763ef308f08ced947a73b624729ac7ea (patch) | |
| tree | 4402b911e30383f6c6dace1e8cf3b8e85355db3a /chromium/base/logging_win.h | |
| parent | 0e8ff63a407fe323e215bb1a2c423c09a4747c8a (diff) | |
| download | qtwebengine-chromium-af3d4809763ef308f08ced947a73b624729ac7ea.tar.gz | |
BASELINE: Update Chromium to 47.0.2526.14
Also adding in sources needed for spellchecking.
Change-Id: Idd44170fa1616f26315188970a8d5ba7d472b18a
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
Diffstat (limited to 'chromium/base/logging_win.h')
| -rw-r--r-- | chromium/base/logging_win.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chromium/base/logging_win.h b/chromium/base/logging_win.h index aa48e22e76d..de34a644093 100644 --- a/chromium/base/logging_win.h +++ b/chromium/base/logging_win.h @@ -12,8 +12,10 @@ #include "base/win/event_trace_provider.h" #include "base/logging.h" +namespace base { template <typename Type> struct StaticMemorySingletonTraits; +} // namespace base namespace logging { @@ -71,7 +73,7 @@ class BASE_EXPORT LogEventProvider : public base::win::EtwTraceProvider { // restored in OnEventsDisabled. logging::LogSeverity old_log_level_; - friend struct StaticMemorySingletonTraits<LogEventProvider>; + friend struct base::StaticMemorySingletonTraits<LogEventProvider>; DISALLOW_COPY_AND_ASSIGN(LogEventProvider); }; |