summaryrefslogtreecommitdiffstats
path: root/chrome/browser/background_mode_manager.cc
diff options
context:
space:
mode:
authoratwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-27 18:53:52 +0000
committeratwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-27 18:53:52 +0000
commit5640e1ad1eccb7e7f6c966f3a50726942d5b1804 (patch)
tree3e6282546298ecd42db694076671d1b7bd8bcdf0 /chrome/browser/background_mode_manager.cc
parent232448fb3a5e41030d35e0e1ae1d1664d96406bf (diff)
downloadchromium_src-5640e1ad1eccb7e7f6c966f3a50726942d5b1804.zip
chromium_src-5640e1ad1eccb7e7f6c966f3a50726942d5b1804.tar.gz
chromium_src-5640e1ad1eccb7e7f6c966f3a50726942d5b1804.tar.bz2
Disable BackgroundModeManager by default for M7, and add an --enable-background-mode
command line flag to enable it. Also remove related preferences items if the --enable-background-mode flag is not passed. BUG=53522 TEST=BackgroundModeManager unit tests pass, run without flag and look at preferences dialog to make sure preferences are not there, launch chrome with --keep-alive-for-test flag, see that no status icon appears Review URL: http://codereview.chromium.org/3219001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57713 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/background_mode_manager.cc')
-rw-r--r--chrome/browser/background_mode_manager.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/background_mode_manager.cc b/chrome/browser/background_mode_manager.cc
index b619177..4fe5e2e 100644
--- a/chrome/browser/background_mode_manager.cc
+++ b/chrome/browser/background_mode_manager.cc
@@ -36,10 +36,10 @@ BackgroundModeManager::BackgroundModeManager(Profile* profile)
background_app_count_(0),
status_tray_(NULL),
status_icon_(NULL) {
- // If background mode is disabled for unittests, just exit - don't listen for
+ // If background mode is globally disabled, just exit - don't listen for
// any notifications.
- if (CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kDisableBackgroundMode))
+ if (!CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kEnableBackgroundMode))
return;
// If the -keep-alive-for-test flag is passed, then always keep chrome running