diff options
| author | dmichael <dmichael@chromium.org> | 2015-04-15 09:07:27 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-15 16:07:41 +0000 |
| commit | 6d5c49f04dc84c1a8472fe3e2357dda3d80ab6f9 (patch) | |
| tree | 0a8974542f9f726f707bbd58bd9736352f0985a9 /content/browser/browser_main_loop.cc | |
| parent | e0c2c8fd00322027ce628ed07b8bef3a3b33aeab (diff) | |
| download | chromium_src-6d5c49f04dc84c1a8472fe3e2357dda3d80ab6f9.zip chromium_src-6d5c49f04dc84c1a8472fe3e2357dda3d80ab6f9.tar.gz chromium_src-6d5c49f04dc84c1a8472fe3e2357dda3d80ab6f9.tar.bz2 | |
Migrate ChromeOS to base::MemoryPressureMonitor
BUG=463546
Review URL: https://codereview.chromium.org/1045433002
Cr-Commit-Position: refs/heads/master@{#325253}
Diffstat (limited to 'content/browser/browser_main_loop.cc')
| -rw-r--r-- | content/browser/browser_main_loop.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc index fcb540c..d485389 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()) { - memory_pressure_observer_.reset(new base::MemoryPressureObserverChromeOS( + memory_pressure_monitor_.reset(new base::MemoryPressureMonitorChromeOS( chromeos::switches::GetMemoryPressureThresholds())); } #endif @@ -852,7 +852,7 @@ void BrowserMainLoop::ShutdownThreadsAndCleanUp() { } #if defined(OS_CHROMEOS) - memory_pressure_observer_.reset(); + memory_pressure_monitor_.reset(); #endif #if defined(OS_MACOSX) |