Index: chrome/browser/ui/cocoa/about_window_controller.mm |
diff --git a/chrome/browser/ui/cocoa/about_window_controller.mm b/chrome/browser/ui/cocoa/about_window_controller.mm |
index 0909acf8db5c71c573af400a820dcca2c1228b86..b80af93208fef6cb310315b5403da327b35e89c6 100644 |
--- a/chrome/browser/ui/cocoa/about_window_controller.mm |
+++ b/chrome/browser/ui/cocoa/about_window_controller.mm |
@@ -11,11 +11,11 @@ |
#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" |
@@ -130,26 +130,12 @@ void AttributedStringAppendHyperlink(NSMutableAttributedString* attr_str, |
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]; |