diff options
| author | mirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-11 20:13:26 +0000 |
|---|---|---|
| committer | mirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-11 20:13:26 +0000 |
| commit | 672c023de1bad91d83ce4b107b9500025be7bec9 (patch) | |
| tree | 30aabe08290cc617a8fdfe5a59b6bd71ad093c9a | |
| parent | d958c2bcceb73db5a5a644f5b5740e78ddcbeb91 (diff) | |
| download | chromium_src-672c023de1bad91d83ce4b107b9500025be7bec9.zip chromium_src-672c023de1bad91d83ce4b107b9500025be7bec9.tar.gz chromium_src-672c023de1bad91d83ce4b107b9500025be7bec9.tar.bz2 | |
Code for stable channel is "", not "stable". Fix in PromoResourceService. Also add check for multi-install Chrome, and update comment for GoogleUpdateSettings::GetChromeChannel to indicate "-m" tags on multi-install channels.
BUG=75783
TEST=promo shows up correctly for stable build, not where it shouldn't.
Review URL: http://codereview.chromium.org/6685003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77850 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/web_resource/promo_resource_service.cc | 8 | ||||
| -rw-r--r-- | chrome/installer/util/google_update_settings.h | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/chrome/browser/web_resource/promo_resource_service.cc b/chrome/browser/web_resource/promo_resource_service.cc index 159d52c..bee8645 100644 --- a/chrome/browser/web_resource/promo_resource_service.cc +++ b/chrome/browser/web_resource/promo_resource_service.cc @@ -340,14 +340,14 @@ bool CanShowPromo(Profile* profile) { bool is_promo_build = false; if (prefs->HasPrefPath(prefs::kNTPPromoBuild)) { int builds_allowed = prefs->GetInteger(prefs::kNTPPromoBuild); - if (channel == "dev") { + if (channel == "dev" || channel == "dev-m") { is_promo_build = (DEV_BUILD & builds_allowed) != 0; - } else if (channel == "beta") { + } else if (channel == "beta" || channel == "beta-m") { is_promo_build = (BETA_BUILD & builds_allowed) != 0; - } else if (channel == "stable") { + } else if (channel == "" || channel == "m") { is_promo_build = (STABLE_BUILD & builds_allowed) != 0; } else { - is_promo_build = true; + is_promo_build = false; } } diff --git a/chrome/installer/util/google_update_settings.h b/chrome/installer/util/google_update_settings.h index 473b3cd..da531b2 100644 --- a/chrome/installer/util/google_update_settings.h +++ b/chrome/installer/util/google_update_settings.h @@ -88,7 +88,9 @@ class GoogleUpdateSettings { // Return a human readable modifier for the version string, e.g. // the channel (dev, beta, stable). Returns true if this operation succeeded, - // on success, channel contains one of "", "unknown", "dev" or "beta". + // on success, channel contains one of "", "unknown", "dev" or "beta" (unless + // it is a multi-install product, in which case it will return "m", + // "unknown-m", "dev-m", or "beta-m"). static bool GetChromeChannel(bool system_install, std::wstring* channel); // This method changes the Google Update "ap" value to move the installation |