summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/browser/about_flags.cc2
-rw-r--r--chrome/browser/background_mode_manager.cc6
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