diff options
| author | georgesak <georgesak@chromium.org> | 2015-07-16 19:54:27 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-17 02:55:21 +0000 |
| commit | a0e5bbd25b8530ac80d82eb104781b01b2ef9ff3 (patch) | |
| tree | 321d385010159628c400ef7bcdb21078cc8d8999 /chrome/browser/browser_process_impl.cc | |
| parent | 5b3e1c46c4c325dfd84b236bb316e37bafdd0120 (diff) | |
| download | chromium_src-a0e5bbd25b8530ac80d82eb104781b01b2ef9ff3.zip chromium_src-a0e5bbd25b8530ac80d82eb104781b01b2ef9ff3.tar.gz chromium_src-a0e5bbd25b8530ac80d82eb104781b01b2ef9ff3.tar.bz2 | |
[Memory] Enable tab discarding on Windows (behind a flag).
This enables tab discarding for Windows, hidden behind a command line flag (enable-tab-discarding).
Mac to follow. On Linux, we will require an implementation of the memory pressure listener before we activate it.
Note: This is CL #8 towards expanding Chromeos tab killing to other platforms. This enables for Windows.
BUG=463597
Review URL: https://codereview.chromium.org/1237703002
Cr-Commit-Position: refs/heads/master@{#339207}
Diffstat (limited to 'chrome/browser/browser_process_impl.cc')
| -rw-r--r-- | chrome/browser/browser_process_impl.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc index 53d73e9..3b182fc 100644 --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc @@ -147,7 +147,7 @@ #include "chrome/browser/media/webrtc_log_uploader.h" #endif -#if defined(OS_CHROMEOS) +#if defined(OS_WIN) || defined(OS_CHROMEOS) #include "chrome/browser/memory/oom_priority_manager.h" #endif @@ -774,7 +774,7 @@ gcm::GCMDriver* BrowserProcessImpl::gcm_driver() { memory::OomPriorityManager* BrowserProcessImpl::GetOomPriorityManager() { DCHECK(CalledOnValidThread()); -#if defined(OS_CHROMEOS) +#if defined(OS_WIN) || defined(OS_CHROMEOS) if (!oom_priority_manager_.get()) oom_priority_manager_.reset(new memory::OomPriorityManager()); return oom_priority_manager_.get(); |