| 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..d2499f3ae7561b48e1c706565ffb8ac0feba1774 100644
|
| --- a/content/browser/browser_main_loop.h
|
| +++ b/content/browser/browser_main_loop.h
|
| @@ -22,8 +22,9 @@ class PowerMonitor;
|
| class SystemMonitor;
|
| #if defined(OS_CHROMEOS)
|
| class MemoryPressureMonitorChromeOS;
|
| -#elif defined(OS_MACOSX)
|
| -class MemoryPressureMonitorMac;
|
| +#elif defined(OS_MACOSX) || defined(OS_WIN)
|
| +class MemoryPressureMonitor;
|
| +} // namespace win
|
| #endif
|
| namespace trace_event {
|
| class TraceMemoryController;
|
| @@ -182,8 +183,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_;
|
|
|