summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormbelshe@chromium.org <mbelshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-06 21:22:40 +0000
committermbelshe@chromium.org <mbelshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-06 21:22:40 +0000
commit95879ad33828c616347f2b063fe37aed08d8bad2 (patch)
tree1db5b0ea2749de7bd857fd57cdae3a7b262fb96b
parent5492cbd2aca71b09df3670c173b47e67e5ec4925 (diff)
downloadchromium_src-95879ad33828c616347f2b063fe37aed08d8bad2.zip
chromium_src-95879ad33828c616347f2b063fe37aed08d8bad2.tar.gz
chromium_src-95879ad33828c616347f2b063fe37aed08d8bad2.tar.bz2
Add the UpgradeDetector to the list of things which don't run when the
--disable-background-networking cmdline switch is set. BUG=none TEST=none Review URL: http://codereview.chromium.org/6802018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80696 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/upgrade_detector.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/browser/upgrade_detector.cc b/chrome/browser/upgrade_detector.cc
index b503e89..8d8d60d 100644
--- a/chrome/browser/upgrade_detector.cc
+++ b/chrome/browser/upgrade_detector.cc
@@ -149,6 +149,9 @@ void UpgradeDetector::RegisterPrefs(PrefService* prefs) {
UpgradeDetector::UpgradeDetector()
: ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)),
notify_upgrade_(false) {
+ CommandLine command_line(*CommandLine::ForCurrentProcess());
+ if (command_line.HasSwitch(switches::kDisableBackgroundNetworking))
+ return;
// Windows: only enable upgrade notifications for official builds.
// Mac: only enable them if the updater (Keystone) is present.
// Linux (and other POSIX): always enable regardless of branding.