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

Unified Diff: chrome/common/mac/app_mode_chrome_locator.mm

Issue 1016543004: [Mac] Use the app's version as the app shim bundle version. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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
Index: chrome/common/mac/app_mode_chrome_locator.mm
diff --git a/chrome/common/mac/app_mode_chrome_locator.mm b/chrome/common/mac/app_mode_chrome_locator.mm
index 923e671d804e356e6e42cfd1a17cd96ff6e8081d..9e2860ee181c8ebc3a755a076a8fc5dc26c370c7 100644
--- a/chrome/common/mac/app_mode_chrome_locator.mm
+++ b/chrome/common/mac/app_mode_chrome_locator.mm
@@ -54,7 +54,12 @@ bool GetChromeBundleInfo(const base::FilePath& chrome_bundle,
!base::PathExists(base::mac::NSStringToFilePath(cr_versioned_path))) {
// Read version string.
NSString* cr_version = ObjCCast<NSString>(
- [cr_bundle objectForInfoDictionaryKey:@"CFBundleShortVersionString"]);
+ [cr_bundle objectForInfoDictionaryKey:@"CrBundleVersion"]);
tapted 2015/03/18 01:49:59 kCrBundleVersionKey? Although I guess that's not
jackhou1 2015/03/18 04:43:48 Done.
+ if (!cr_version) {
+ // Older bundles have the Chrome version in the following key.
+ cr_version = ObjCCast<NSString>(
+ [cr_bundle objectForInfoDictionaryKey:@"CFBundleShortVersionString"]);
+ }
if (!cr_version)
return false;

Powered by Google App Engine
This is Rietveld 408576698