Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1350)

Side by Side Diff: content/browser/browser_main_loop.h

Issue 869043008: Reland of Move tracing namespace from base::debug to base::trace_event. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkcr
Patch Set: Fix suppressions Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « cc/trees/proxy.h ('k') | content/child/child_thread_impl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_ 5 #ifndef CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_
6 #define CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_ 6 #define CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/files/file_path.h" 9 #include "base/files/file_path.h"
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "base/timer/timer.h" 12 #include "base/timer/timer.h"
13 #include "content/browser/browser_process_sub_thread.h" 13 #include "content/browser/browser_process_sub_thread.h"
14 #include "content/public/browser/browser_main_runner.h" 14 #include "content/public/browser/browser_main_runner.h"
15 15
16 namespace base { 16 namespace base {
17 class CommandLine; 17 class CommandLine;
18 class FilePath; 18 class FilePath;
19 class HighResolutionTimerManager; 19 class HighResolutionTimerManager;
20 class MessageLoop; 20 class MessageLoop;
21 class PowerMonitor; 21 class PowerMonitor;
22 class SystemMonitor; 22 class SystemMonitor;
23 #if defined(OS_CHROMEOS) 23 #if defined(OS_CHROMEOS)
24 class MemoryPressureObserverChromeOS; 24 class MemoryPressureObserverChromeOS;
25 #endif 25 #endif
26 namespace debug { 26 namespace trace_event {
27 class TraceMemoryController; 27 class TraceMemoryController;
28 class TraceEventSystemStatsMonitor; 28 class TraceEventSystemStatsMonitor;
29 } // namespace trace_event
30
31 // TODO(ssid): remove these aliases after the tracing clients are moved to the
32 // new trace_event namespace. See crbug.com/451032. ETA: March 2015
33 namespace debug {
34 using ::base::trace_event::TraceEventSystemStatsMonitor;
35 using ::base::trace_event::TraceMemoryController;
29 } // namespace debug 36 } // namespace debug
30 } // namespace base 37 } // namespace base
31 38
32 namespace media { 39 namespace media {
33 class AudioManager; 40 class AudioManager;
34 class MidiManager; 41 class MidiManager;
35 class UserInputMonitor; 42 class UserInputMonitor;
36 } // namespace media 43 } // namespace media
37 44
38 namespace net { 45 namespace net {
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 227
221 // This timer initiates trace file saving. 228 // This timer initiates trace file saving.
222 base::OneShotTimer<BrowserMainLoop> startup_trace_timer_; 229 base::OneShotTimer<BrowserMainLoop> startup_trace_timer_;
223 230
224 DISALLOW_COPY_AND_ASSIGN(BrowserMainLoop); 231 DISALLOW_COPY_AND_ASSIGN(BrowserMainLoop);
225 }; 232 };
226 233
227 } // namespace content 234 } // namespace content
228 235
229 #endif // CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_ 236 #endif // CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_
OLDNEW
« no previous file with comments | « cc/trees/proxy.h ('k') | content/child/child_thread_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698