[Mac] Use the app's version as the app shim bundle version.

chrome/browser/web_applications/web_app_mac.mm

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/web_applications/web_app_mac.h"
 
 #import <Carbon/Carbon.h>
 #import <Cocoa/Cocoa.h>
 
 #include "base/command_line.h"
@@ skipping 482 matching lines @@
     shortcut_info.profile_path = user_data_dir.DirName().DirName();
   else
     shortcut_info.profile_path = user_data_dir.Append(profile_base_name);
 
   return shortcut_info;
 }
 
 web_app::ShortcutInfo RecordAppShimErrorAndBuildShortcutInfo(
     const base::FilePath& bundle_path) {
   NSDictionary* plist = ReadPlist(GetPlistPath(bundle_path));
-  base::Version full_version(base::SysNSStringToUTF8(
-      [plist valueForKey:app_mode::kCFBundleShortVersionStringKey]));
+  NSString* version_string = [plist valueForKey:app_mode::kCrBundleVersionKey];
+  if (!version_string) {
+    // Older bundles have the Chrome version in the following key.
+    version_string =
+        [plist valueForKey:app_mode::kCFBundleShortVersionStringKey];
+  }
+  base::Version full_version(base::SysNSStringToUTF8(version_string));
   uint32_t major_version = 0;
   if (full_version.IsValid())
     major_version = full_version.components()[0];
   UMA_HISTOGRAM_SPARSE_SLOWLY("Apps.AppShimErrorVersion", major_version);
 
   return BuildShortcutInfoFromBundle(bundle_path);
 }
 
 void UpdateFileTypes(NSMutableDictionary* plist,
                      const extensions::FileHandlersInfo& file_handlers_info) {
@@ skipping 318 matching lines @@
     // Remove leading and trailing '@'s.
     NSString* variable =
         [value substringWithRange:NSMakeRange(1, [value length] - 2)];
 
     NSString* substitution = [replacement_dict valueForKey:variable];
     if (substitution)
       [plist setObject:substitution forKey:key];
   }
 
   // 2. Fill in other values.
+  [plist setObject:base::SysUTF8ToNSString(chrome::VersionInfo().Version())
+            forKey:app_mode::kCrBundleVersionKey];
+  [plist setObject:base::SysUTF8ToNSString(info_.version_for_display)
+            forKey:app_mode::kCFBundleShortVersionStringKey];
   [plist setObject:base::SysUTF8ToNSString(GetBundleIdentifier())
             forKey:base::mac::CFToNSCast(kCFBundleIdentifierKey)];
   [plist setObject:base::mac::FilePathToNSString(app_data_dir_)
             forKey:app_mode::kCrAppModeUserDataDirKey];
   [plist setObject:base::mac::FilePathToNSString(info_.profile_path.BaseName())
             forKey:app_mode::kCrAppModeProfileDirKey];
   [plist setObject:base::SysUTF8ToNSString(info_.profile_name)
             forKey:app_mode::kCrAppModeProfileNameKey];
   [plist setObject:[NSNumber numberWithBool:YES]
             forKey:app_mode::kLSHasLocalizedDisplayNameKey];
@@ skipping 339 matching lines @@
   web_app::GetShortcutInfoForApp(
       app,
       profile,
       base::Bind(&web_app::CreateAppShortcutInfoLoaded,
                  profile,
                  app,
                  close_callback));
 }
 
 }  // namespace chrome