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

Unified Diff: content/browser/browser_main_loop.h

Issue 1122863005: Create base::win::MemoryPressureMonitor class. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed thakis@ and brucedawson@ comments. Created 5 years, 7 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 0a9e387eef262c50034e9ef9233651f5be02b106..2d3bc2bdf412aa876b5cfaa8bfbd6812f88bb706 100644
--- a/content/browser/browser_main_loop.h
+++ b/content/browser/browser_main_loop.h
@@ -22,8 +22,8 @@ class PowerMonitor;
class SystemMonitor;
#if defined(OS_CHROMEOS)
class MemoryPressureMonitorChromeOS;
-#elif defined(OS_MACOSX)
-class MemoryPressureMonitorMac;
+#elif defined(OS_MACOSX) || defined(OS_WIN)
grt (UTC plus 2) 2015/05/06 13:26:36 ? (defined(OS_MACOSX) && !defined(OS_IOS)) || defi
chrisha 2015/05/06 15:09:57 Yeah, this was a case of me simply editing what wa
+class MemoryPressureMonitor;
#endif
namespace trace_event {
class TraceMemoryController;
@@ -182,8 +182,8 @@ class CONTENT_EXPORT BrowserMainLoop {
#endif
#if defined(OS_CHROMEOS)
scoped_ptr<base::MemoryPressureMonitorChromeOS> memory_pressure_monitor_;
-#elif defined(OS_MACOSX) && !defined(OS_IOS)
- scoped_ptr<base::MemoryPressureMonitorMac> memory_pressure_monitor_;
+#elif (defined(OS_MACOSX) && !defined(OS_IOS)) || defined(OS_WIN)
+ scoped_ptr<base::MemoryPressureMonitor> memory_pressure_monitor_;
#endif
// The startup task runner is created by CreateStartupTasks()
scoped_ptr<StartupTaskRunner> startup_task_runner_;

Powered by Google App Engine
This is Rietveld 408576698