content/browser/browser_main_loop.cc - Issue 1045433002: Migrate ChromeOS to base::MemoryPressureMonitor

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: 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:

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..d485389c44e98099fb7e177ef3e3794a691cdf19 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)

« no previous file with comments | « content/browser/browser_main_loop.h ('k') | content/browser/memory_pressure_observer.cc » ('j') | no next file with comments »