summaryrefslogtreecommitdiffstats
path: root/chrome/common/platform_util_mac.mm
diff options
context:
space:
mode:
authorjrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-15 18:38:25 +0000
committerjrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-15 18:38:25 +0000
commit2772b637e69f7160b08cc1367f9382ab8656e1a9 (patch)
tree2e4c23b7a67c974c1e6aa488bd6e52965284ee12 /chrome/common/platform_util_mac.mm
parent38b44f19e11a45dcbb34c35f0c85d687aabf6b65 (diff)
downloadchromium_src-2772b637e69f7160b08cc1367f9382ab8656e1a9.zip
chromium_src-2772b637e69f7160b08cc1367f9382ab8656e1a9.tar.gz
chromium_src-2772b637e69f7160b08cc1367f9382ab8656e1a9.tar.bz2
New consensus is to print
"" if stable, "dev" or "beta" if dev or beta, and "unknown" in all other cases. BUG=31772 Review URL: http://codereview.chromium.org/545063 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36375 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/platform_util_mac.mm')
-rw-r--r--chrome/common/platform_util_mac.mm11
1 files changed, 9 insertions, 2 deletions
diff --git a/chrome/common/platform_util_mac.mm b/chrome/common/platform_util_mac.mm
index 359af9e..3b72ef3 100644
--- a/chrome/common/platform_util_mac.mm
+++ b/chrome/common/platform_util_mac.mm
@@ -89,8 +89,15 @@ string16 GetVersionStringModifier() {
#if defined(GOOGLE_CHROME_BUILD)
NSBundle* bundle = mac_util::MainAppBundle();
NSString* channel = [bundle objectForInfoDictionaryKey:@"KSChannelID"];
- if (!channel)
- channel = @"stable";
+ // Only ever return "", "unknown", "beta" or "dev" in a branded build.
+ if ([channel isEqual:@"stable"]) {
+ channel = @"";
+ } else if ([channel isEqual:@"beta"] || [channel isEqual:@"dev"]) {
+ // do nothing.
+ } else {
+ channel = @"unknown";
+ }
+
return base::SysNSStringToUTF16(channel);
#else
return string16();