Unify the version string to be displayed on "About Chromium" dialog.

chrome/browser/ui/cocoa/about_window_controller.mm

 // Copyright (c) 2011 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/ui/cocoa/about_window_controller.h"
 
 #include "base/logging.h"
 #include "base/mac/mac_util.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #import "chrome/browser/cocoa/keystone_glue.h"
 #include "chrome/browser/google/google_util.h"
-#include "chrome/browser/platform_util.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #import "chrome/browser/ui/cocoa/background_tile_view.h"
 #include "chrome/browser/ui/cocoa/restart_browser.h"
+#include "chrome/common/chrome_version_info.h"
 #include "chrome/common/url_constants.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
 #include "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
@@ skipping 94 matching lines @@
 // YES when an About box is currently showing the kAutoupdateInstallFailed
 // status, or if no About box is visible, if the most recent About box to be
 // closed was closed while showing this status.  When an About box opens, if
 // the recent status is kAutoupdateInstallFailed or kAutoupdatePromoteFailed
 // and recentShownUserActionFailedStatus is NO, the failure needs to be shown
 // instead of launching a new update check.  recentShownInstallFailedStatus is
 // maintained by -updateStatus:.
 static BOOL recentShownUserActionFailedStatus = NO;
 
 - (void)awakeFromNib {
-  NSBundle* bundle = base::mac::MainAppBundle();
-  NSString* chromeVersion =
-      [bundle objectForInfoDictionaryKey:@"CFBundleShortVersionString"];
-
-  NSString* versionModifier = @"";
-  NSString* svnRevision = @"";
-  std::string modifier = platform_util::GetVersionStringModifier();
-  if (!modifier.empty())
-    versionModifier = [NSString stringWithFormat:@" %@",
-                                base::SysUTF8ToNSString(modifier)];
-
-#if !defined(GOOGLE_CHROME_BUILD)
-  svnRevision = [NSString stringWithFormat:@" (%@)",
-                          [bundle objectForInfoDictionaryKey:@"SVNRevision"]];
-#endif
+  chrome::VersionInfo version_info;
   // The format string is not localized, but this is how the displayed version
   // is built on Windows too.
-  NSString* version =
-    [NSString stringWithFormat:@"%@%@%@",
-              chromeVersion, svnRevision, versionModifier];
+  NSString* version = [NSString stringWithFormat:@"%@",
+                                base::SysUTF8ToNSString(
+                                    version_info.CreateVersionString())];
 
   [version_ setStringValue:version];
 
   // Put the two images into the UI.
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   NSImage* backgroundImage = rb.GetNativeImageNamed(IDR_ABOUT_BACKGROUND_COLOR);
   DCHECK(backgroundImage);
   [backgroundView_ setTileImage:backgroundImage];
   NSImage* logoImage = rb.GetNativeImageNamed(IDR_ABOUT_BACKGROUND);
   DCHECK(logoImage);
@@ skipping 593 matching lines @@
   NSRange string_range = NSMakeRange(0, [legal_block length]);
   [legal_block addAttribute:NSFontAttributeName
                       value:[NSFont labelFontOfSize:11]
                       range:string_range];
 
   [legal_block endEditing];
   return legal_block;
 }
 
 @end  // @implementation AboutWindowController