Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3985)

Unified Diff: chrome/browser/platform_util_mac.mm

Issue 2791001: Take Keystone keys out of the framework's Info.plist (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/cocoa/keystone_glue.mm ('k') | chrome/chrome.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/platform_util_mac.mm
===================================================================
--- chrome/browser/platform_util_mac.mm (revision 49261)
+++ chrome/browser/platform_util_mac.mm (working copy)
@@ -73,14 +73,16 @@
string16 GetVersionStringModifier() {
#if defined(GOOGLE_CHROME_BUILD)
- NSBundle* bundle = mac_util::MainAppBundle();
+ // Use the main application bundle and not the framework bundle. Keystone
+ // keys don't live in the framework.
+ NSBundle* bundle = [NSBundle mainBundle];
NSString* channel = [bundle objectForInfoDictionaryKey:@"KSChannelID"];
// Only ever return "", "unknown", "beta" or "dev" in a branded build.
if (![bundle objectForInfoDictionaryKey:@"KSProductID"]) {
// This build is not Keystone-enabled, it can't have a channel.
channel = @"unknown";
- } else if (!channel || [channel isEqual:@"stable"]) {
+ } else if (!channel) {
// For the stable channel, KSChannelID is not set.
channel = @"";
} else if ([channel isEqual:@"beta"] || [channel isEqual:@"dev"]) {
« no previous file with comments | « chrome/browser/cocoa/keystone_glue.mm ('k') | chrome/chrome.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698