diff options
| author | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-23 23:28:40 +0000 |
|---|---|---|
| committer | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-23 23:28:40 +0000 |
| commit | 49b60d92ba595231799186f8fd006aa418189ad5 (patch) | |
| tree | 2f1ee10ea950dfc806cb311dcfd9b5260f98b3be | |
| parent | b70becd2d229c45fe7b97624b5ad3c1e7efc8408 (diff) | |
| download | chromium_src-49b60d92ba595231799186f8fd006aa418189ad5.zip chromium_src-49b60d92ba595231799186f8fd006aa418189ad5.tar.gz chromium_src-49b60d92ba595231799186f8fd006aa418189ad5.tar.bz2 | |
Enable background mode on Mac by default.
BUG=59980
TEST=enable extension with background page, see wrench menu badge
Review URL: http://codereview.chromium.org/6037010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70114 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/about_flags.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/background_mode_manager.cc | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc index 21ae4f5..5085859 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc @@ -155,7 +155,7 @@ const Experiment kExperiments[] = { "background-webapps", // FLAGS:RECORD_UMA IDS_FLAGS_BACKGROUND_WEBAPPS_NAME, IDS_FLAGS_BACKGROUND_WEBAPPS_DESCRIPTION, - kOsMac | kOsLinux | kOsCrOS, // Enabled by default on windows + kOsLinux, // Enabled by default on windows and mac, not available on CrOS. SINGLE_VALUE_TYPE(switches::kEnableBackgroundMode) }, { diff --git a/chrome/browser/background_mode_manager.cc b/chrome/browser/background_mode_manager.cc index f51ffa7..74c0df6 100644 --- a/chrome/browser/background_mode_manager.cc +++ b/chrome/browser/background_mode_manager.cc @@ -368,9 +368,9 @@ 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. +#if !(defined(OS_WIN) || defined(OS_MACOSX)) + // BackgroundMode is enabled by default on windows and mac. On other + // platforms, it is enabled via about:flags. background_mode_enabled = background_mode_enabled && command_line->HasSwitch(switches::kEnableBackgroundMode); #endif |