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

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

Issue 1468883003: Remove memory category from chrome://tracing (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@format-trace-event
Patch Set: Rebase Created 5 years 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 | « base/trace_event/trace_event_memory_unittest.cc ('k') | content/browser/browser_main_loop.cc » ('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 class MemoryPressureMonitor; 23 class MemoryPressureMonitor;
24 namespace trace_event { 24 namespace trace_event {
25 class TraceMemoryController;
26 class TraceEventSystemStatsMonitor; 25 class TraceEventSystemStatsMonitor;
27 } // namespace trace_event 26 } // namespace trace_event
28 } // namespace base 27 } // namespace base
29 28
30 namespace IPC { 29 namespace IPC {
31 class ScopedIPCSupport; 30 class ScopedIPCSupport;
32 } 31 }
33 32
34 namespace media { 33 namespace media {
35 class AudioManager; 34 class AudioManager;
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 #if defined(OS_WIN) 199 #if defined(OS_WIN)
201 scoped_ptr<SystemMessageWindowWin> system_message_window_; 200 scoped_ptr<SystemMessageWindowWin> system_message_window_;
202 #endif 201 #endif
203 202
204 #if defined(OS_ANDROID) 203 #if defined(OS_ANDROID)
205 // Android implementation of ScreenOrientationDelegate 204 // Android implementation of ScreenOrientationDelegate
206 scoped_ptr<ScreenOrientationDelegate> screen_orientation_delegate_; 205 scoped_ptr<ScreenOrientationDelegate> screen_orientation_delegate_;
207 #endif 206 #endif
208 207
209 scoped_ptr<MemoryObserver> memory_observer_; 208 scoped_ptr<MemoryObserver> memory_observer_;
210 scoped_ptr<base::trace_event::TraceMemoryController> trace_memory_controller_;
211 209
212 // Members initialized in |InitStartupTracingForDuration()| ------------------ 210 // Members initialized in |InitStartupTracingForDuration()| ------------------
213 base::FilePath startup_trace_file_; 211 base::FilePath startup_trace_file_;
214 212
215 // This timer initiates trace file saving. 213 // This timer initiates trace file saving.
216 base::OneShotTimer startup_trace_timer_; 214 base::OneShotTimer startup_trace_timer_;
217 215
218 // Members initialized in |Init()| ------------------------------------------- 216 // Members initialized in |Init()| -------------------------------------------
219 // Destroy |parts_| before |main_message_loop_| (required) and before other 217 // Destroy |parts_| before |main_message_loop_| (required) and before other
220 // classes constructed in content (but after |main_thread_|). 218 // classes constructed in content (but after |main_thread_|).
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
265 scoped_ptr<TimeZoneMonitor> time_zone_monitor_; 263 scoped_ptr<TimeZoneMonitor> time_zone_monitor_;
266 264
267 // DO NOT add members here. Add them to the right categories above. 265 // DO NOT add members here. Add them to the right categories above.
268 266
269 DISALLOW_COPY_AND_ASSIGN(BrowserMainLoop); 267 DISALLOW_COPY_AND_ASSIGN(BrowserMainLoop);
270 }; 268 };
271 269
272 } // namespace content 270 } // namespace content
273 271
274 #endif // CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_ 272 #endif // CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_
OLDNEW
« no previous file with comments | « base/trace_event/trace_event_memory_unittest.cc ('k') | content/browser/browser_main_loop.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698