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

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: cleanup/fixes Created 5 years, 9 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 5050cd0cde34ae88635651942ffc3a6cd6c59fe7..19b16f61bd5910e4de4324421ac7645645408e25 100644
--- a/content/browser/browser_main_loop.h
+++ b/content/browser/browser_main_loop.h
@@ -20,9 +20,6 @@ class HighResolutionTimerManager;
class MessageLoop;
class PowerMonitor;
class SystemMonitor;
-#if defined(OS_CHROMEOS)
-class MemoryPressureObserverChromeOS;
-#endif
namespace trace_event {
class TraceMemoryController;
class TraceEventSystemStatsMonitor;
@@ -118,12 +115,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;
@@ -184,9 +175,6 @@ class CONTENT_EXPORT BrowserMainLoop {
// Android implementation of ScreenOrientationDelegate
scoped_ptr<ScreenOrientationDelegate> screen_orientation_delegate_;
#endif
-#if defined(OS_CHROMEOS)
- scoped_ptr<base::MemoryPressureObserverChromeOS> memory_pressure_observer_;
-#endif
// The startup task runner is created by CreateStartupTasks()
scoped_ptr<StartupTaskRunner> startup_task_runner_;

Powered by Google App Engine
This is Rietveld 408576698