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

Unified Diff: chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Issue 800603002: Move MemoryPressureObserverChromeOS instantiation from Chrome to Content (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Moving again Created 6 years 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: chrome/browser/chromeos/chrome_browser_main_chromeos.cc
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
index 1d3c8a3edc898847d8c81f7a525a7930b70af646..25bacfdec317f46c560c4682a13d7e3ea2838723 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -11,7 +11,6 @@
#include "ash/shell.h"
#include "base/bind.h"
#include "base/callback.h"
-#include "base/chromeos/memory_pressure_observer_chromeos.h"
#include "base/command_line.h"
#include "base/files/file_util.h"
#include "base/lazy_instance.h"
@@ -333,12 +332,6 @@ void ChromeBrowserMainPartsChromeos::PreMainMessageLoopStart() {
}
void ChromeBrowserMainPartsChromeos::PostMainMessageLoopStart() {
- // Instantiate the MemoryPressureObserver.
- if (CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kUseMemoryPressureSystemChromeOS)) {
- memory_pressure_observer_.reset(new base::MemoryPressureObserverChromeOS);
- }
-
base::FilePath user_data_dir;
if (!base::SysInfo::IsRunningOnChromeOS() &&
PathService::Get(chrome::DIR_USER_DATA, &user_data_dir)) {
@@ -708,9 +701,6 @@ void ChromeBrowserMainPartsChromeos::PostBrowserStart() {
void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() {
BootTimesLoader::Get()->AddLogoutTimeMarker("UIMessageLoopEnded", true);
- // Remove the MemoryPressureObserver since it is not needed anymore.
- memory_pressure_observer_.reset();
-
g_browser_process->platform_part()->oom_priority_manager()->Stop();
// Early wake-up of HID device service.

Powered by Google App Engine
This is Rietveld 408576698