diff options
| author | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-08 18:33:45 +0000 |
|---|---|---|
| committer | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-08 18:33:45 +0000 |
| commit | 172026f8ba9b893920936e03f716e56ba716cbd6 (patch) | |
| tree | bd0c09916854002744e21b63c4ac8d104f477a57 /chrome/browser/background_mode_manager.cc | |
| parent | aea360fdf43b5822a6b772596e50f755aa246cf8 (diff) | |
| download | chromium_src-172026f8ba9b893920936e03f716e56ba716cbd6.zip chromium_src-172026f8ba9b893920936e03f716e56ba716cbd6.tar.gz chromium_src-172026f8ba9b893920936e03f716e56ba716cbd6.tar.bz2 | |
Bring BG mode out from behind the flag on Windows.
Revert 68523 - 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
TBR=atwilson@chromium.org
Review URL: http://codereview.chromium.org/5568009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68614 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, 5 insertions, 2 deletions
diff --git a/chrome/browser/background_mode_manager.cc b/chrome/browser/background_mode_manager.cc index 741195c..ad3d0a7 100644 --- a/chrome/browser/background_mode_manager.cc +++ b/chrome/browser/background_mode_manager.cc @@ -573,10 +573,13 @@ bool BackgroundModeManager::IsBackgroundModeEnabled( bool background_mode_enabled = !command_line->HasSwitch(switches::kDisableBackgroundMode) && !command_line->HasSwitch(switches::kDisableExtensions); - - // Only enable BackgroundMode if the associated flag is enabled. +#if !defined(OS_WIN) + // BackgroundMode is enabled by default on windows. On other platforms, it + // is enabled via about:flags. background_mode_enabled = background_mode_enabled && command_line->HasSwitch(switches::kEnableBackgroundMode); +#endif + return background_mode_enabled; } |