summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-27 06:21:58 +0000
committerfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-27 06:21:58 +0000
commitcf3bedab649a3dfb5b17ff0a623a94566e30fe53 (patch)
tree5585b56407b3b82d70008867cfcf36fe7a6f108b /chrome
parent64e41217726cda2866e54fe2c93207da496c134b (diff)
downloadchromium_src-cf3bedab649a3dfb5b17ff0a623a94566e30fe53.zip
chromium_src-cf3bedab649a3dfb5b17ff0a623a94566e30fe53.tar.gz
chromium_src-cf3bedab649a3dfb5b17ff0a623a94566e30fe53.tar.bz2
Make sure the upgrade notification only happens on the official build, not on Chromium.
TBR=ben BUG=None TEST=None Review URL: http://codereview.chromium.org/2282005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48368 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/upgrade_detector.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/chrome/browser/upgrade_detector.cc b/chrome/browser/upgrade_detector.cc
index 5112fcd..e689d21 100644
--- a/chrome/browser/upgrade_detector.cc
+++ b/chrome/browser/upgrade_detector.cc
@@ -32,13 +32,11 @@ static int kNotifyUserAfterMs = 0;
UpgradeDetector::UpgradeDetector()
: upgrade_detected_(false),
notify_upgrade_(false) {
-#if !defined(OS_WIN)
- return;
-#endif
-
+#if defined(OS_WIN) && defined(GOOGLE_CHROME_BUILD)
detect_upgrade_timer_.Start(
base::TimeDelta::FromMilliseconds(kCheckForUpgradeEveryMs),
this, &UpgradeDetector::CheckForUpgrade);
+#endif
}
UpgradeDetector::~UpgradeDetector() {