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

Unified Diff: content/browser/browser_main_loop.h

Issue 1124163003: Rename OS-specific MemoryPressureMonitor implementations. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix compile error on ChromeOS. Created 5 years, 7 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/browser_main_loop.h
diff --git a/content/browser/browser_main_loop.h b/content/browser/browser_main_loop.h
index f83236521261766491aa277a6dc34740592c664e..27bc664bd7208f53b1c15e5c1dc05f4eb6f258b8 100644
--- a/content/browser/browser_main_loop.h
+++ b/content/browser/browser_main_loop.h
@@ -20,11 +20,7 @@ class HighResolutionTimerManager;
class MessageLoop;
class PowerMonitor;
class SystemMonitor;
-#if defined(OS_CHROMEOS)
-class MemoryPressureMonitorChromeOS;
-#elif (defined(OS_MACOSX) && !defined(OS_IOS)) || defined(OS_WIN)
class MemoryPressureMonitor;
-#endif
namespace trace_event {
class TraceMemoryController;
class TraceEventSystemStatsMonitor;
@@ -182,11 +178,11 @@ class CONTENT_EXPORT BrowserMainLoop {
// Android implementation of ScreenOrientationDelegate
scoped_ptr<ScreenOrientationDelegate> screen_orientation_delegate_;
#endif
-#if defined(OS_CHROMEOS)
- scoped_ptr<base::MemoryPressureMonitorChromeOS> memory_pressure_monitor_;
-#elif (defined(OS_MACOSX) && !defined(OS_IOS)) || defined(OS_WIN)
+
+ // Memory pressure monitor. Created in PreCreateThreads and torn down in
+ // ShutdownThreadsAndCleanUp.
scoped_ptr<base::MemoryPressureMonitor> memory_pressure_monitor_;
-#endif
+
// The startup task runner is created by CreateStartupTasks()
scoped_ptr<StartupTaskRunner> startup_task_runner_;

Powered by Google App Engine
This is Rietveld 408576698