diff options
| author | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-07 22:17:22 +0000 |
|---|---|---|
| committer | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-07 22:17:22 +0000 |
| commit | 3aa8203e4e4d24d36a1ad14ab5501cd219bf2ec3 (patch) | |
| tree | 1c359db52537ff39d07d1cac95304ce3a71b1292 /chrome/browser/background_mode_manager.cc | |
| parent | 4811bfb0cf32b50bc206d2f5030eef697b84cafa (diff) | |
| download | chromium_src-3aa8203e4e4d24d36a1ad14ab5501cd219bf2ec3.zip chromium_src-3aa8203e4e4d24d36a1ad14ab5501cd219bf2ec3.tar.gz chromium_src-3aa8203e4e4d24d36a1ad14ab5501cd219bf2ec3.tar.bz2 | |
Put BG mode back behind a flag for now.
Just makes Windows functionality match mac/linux by gating background mode on
an about:flags setting.
BUG=65657
TEST=Install extension with background page, no wrench menu badge
Review URL: http://codereview.chromium.org/5552004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68523 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/background_mode_manager.cc')
| -rw-r--r-- | chrome/browser/background_mode_manager.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/chrome/browser/background_mode_manager.cc b/chrome/browser/background_mode_manager.cc index ad3d0a7..741195c 100644 --- a/chrome/browser/background_mode_manager.cc +++ b/chrome/browser/background_mode_manager.cc @@ -573,13 +573,10 @@ bool BackgroundModeManager::IsBackgroundModeEnabled( bool background_mode_enabled = !command_line->HasSwitch(switches::kDisableBackgroundMode) && !command_line->HasSwitch(switches::kDisableExtensions); -#if !defined(OS_WIN) - // BackgroundMode is enabled by default on windows. On other platforms, it - // is enabled via about:flags. + + // Only enable BackgroundMode if the associated flag is enabled. background_mode_enabled = background_mode_enabled && command_line->HasSwitch(switches::kEnableBackgroundMode); -#endif - return background_mode_enabled; } |