Use CFBundleVersion for product_version on iOS

base/file_version_info_mac.mm

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
 #include "base/file_version_info_mac.h"
 
 #import <Foundation/Foundation.h>
 
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/mac/bundle_locations.h"
@@ skipping 41 matching lines @@
 
 string16 FileVersionInfoMac::comments() {
   return string16();
 }
 
 string16 FileVersionInfoMac::legal_copyright() {
   return GetString16Value(CFSTR("CFBundleGetInfoString"));
 }
 
 string16 FileVersionInfoMac::product_version() {
+  // On OS X, CFBundleVersion is used by LaunchServices, and must follow
+  // specific formatting rules, so the four-part Chrome version is in
+  // CFBundleShortVersionString. On iOS, however, CFBundleVersion can be the

[Mark Mentovai, 2012/07/23 20:48:43]

Oh, wow.

[stuartmorgan, 2012/07/24 09:37:55]

Yeah, having completely different arbitrary rules for versioning between
platforms is pretty awesome. At least on iOS it's documented, so you don't have
to reverse-engineer the maximums for each component :P

+  // full version, but CFBundleShortVersionString has a policy-enfoced limit
+  // of three version components.
+#if defined(OS_IOS)
+  return GetString16Value(CFSTR("CFBundleVersion"));
+#else
   return GetString16Value(CFSTR("CFBundleShortVersionString"));
+#endif  // defined(OS_IOS)
 }
 
 string16 FileVersionInfoMac::file_description() {
   return string16();
 }
 
 string16 FileVersionInfoMac::legal_trademarks() {
   return string16();
 }
 
@@ skipping 28 matching lines @@
 string16 FileVersionInfoMac::GetString16Value(CFStringRef name) {
   if (bundle_) {
     NSString *ns_name = base::mac::CFToNSCast(name);
     NSString* value = [bundle_ objectForInfoDictionaryKey:ns_name];
     if (value) {
       return base::SysNSStringToUTF16(value);
     }
   }
   return string16();
 }