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

Unified Diff: content/browser/browser_main_loop.cc

Issue 1045433002: Migrate ChromeOS to base::MemoryPressureMonitor (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove no-longer-relevant OWNERS change 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
Index: content/browser/browser_main_loop.cc
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
index fcb540c3318fcf859bd1631eb39534b1fb94a34b..afc137de3aa45f77bf0c6f90472e73e61e435a15 100644
--- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc
@@ -103,7 +103,7 @@
#endif
#if defined(OS_CHROMEOS)
-#include "base/chromeos/memory_pressure_observer_chromeos.h"
+#include "base/chromeos/memory_pressure_monitor_chromeos.h"
#include "chromeos/chromeos_switches.h"
#endif
@@ -590,7 +590,7 @@ int BrowserMainLoop::PreCreateThreads() {
#if defined(OS_CHROMEOS)
if (chromeos::switches::MemoryPressureHandlingEnabled()) {
chrisha 2015/04/08 21:38:16 Hmm... might need to promote this to a pan-OS swit
dmichael (off chromium) 2015/04/08 22:09:03 Perhaps. It's just "always on" for Android I think
- memory_pressure_observer_.reset(new base::MemoryPressureObserverChromeOS(
+ memory_pressure_observer_.reset(new base::MemoryPressureMonitorChromeOS(
chromeos::switches::GetMemoryPressureThresholds()));
}
#endif

Powered by Google App Engine
This is Rietveld 408576698