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

Issues Search
    My Issues | Starred     Open | Closed | All

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: Rebase and pretty_print to make histograms.xml happy. 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
« base/win/memory_pressure_monitor.h ('K') | « base/win/memory_pressure_monitor_unittest.cc ('k') | content/browser/browser_main_loop.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/browser_main_loop.h
diff --git a/content/browser/browser_main_loop.h b/content/browser/browser_main_loop.h
index 2b798bf85d5a033941dd7927b4d3ce8bff879d01..f83236521261766491aa277a6dc34740592c664e 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_IOS)) || defined(OS_WIN)
+class MemoryPressureMonitor;
#endif
namespace trace_event {
class TraceMemoryController;
@@ -184,8 +184,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_;
« base/win/memory_pressure_monitor.h ('K') | « base/win/memory_pressure_monitor_unittest.cc ('k') | content/browser/browser_main_loop.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698