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

Unified Diff: content/browser/browser_main_loop.h

Issue 1045433002: Migrate ChromeOS to base::MemoryPressureMonitor (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: review comments Created 5 years, 8 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
« no previous file with comments | « chromeos/chromeos_switches.cc ('k') | content/browser/browser_main_loop.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/browser_main_loop.h
diff --git a/content/browser/browser_main_loop.h b/content/browser/browser_main_loop.h
index 5050cd0cde34ae88635651942ffc3a6cd6c59fe7..bae07bceab3b904fadbaebdef1a012dba2c0e623 100644
--- a/content/browser/browser_main_loop.h
+++ b/content/browser/browser_main_loop.h
@@ -21,7 +21,7 @@ class MessageLoop;
class PowerMonitor;
class SystemMonitor;
#if defined(OS_CHROMEOS)
-class MemoryPressureObserverChromeOS;
+class MemoryPressureMonitorChromeOS;
#endif
namespace trace_event {
class TraceMemoryController;
@@ -118,12 +118,6 @@ class CONTENT_EXPORT BrowserMainLoop {
return device_monitor_mac_.get();
}
#endif
-#if defined(OS_CHROMEOS)
- // Return the MemoryPressureObserver which might be NULL.
- base::MemoryPressureObserverChromeOS* memory_pressure_observer() {
- return memory_pressure_observer_.get();
- }
-#endif
private:
class MemoryObserver;
@@ -185,7 +179,7 @@ class CONTENT_EXPORT BrowserMainLoop {
scoped_ptr<ScreenOrientationDelegate> screen_orientation_delegate_;
#endif
#if defined(OS_CHROMEOS)
- scoped_ptr<base::MemoryPressureObserverChromeOS> memory_pressure_observer_;
+ scoped_ptr<base::MemoryPressureMonitorChromeOS> memory_pressure_monitor_;
#endif
// The startup task runner is created by CreateStartupTasks()
scoped_ptr<StartupTaskRunner> startup_task_runner_;
« no previous file with comments | « chromeos/chromeos_switches.cc ('k') | content/browser/browser_main_loop.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698