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

Unified Diff: chrome/browser/ui/cocoa/about_window_controller.mm

Issue 7104106: Unify the version string to be displayed on "About Chromium" dialog. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Update how to construct webkit_url Created 9 years, 5 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
« no previous file with comments | « chrome/app/nibs/About.xib ('k') | chrome/browser/ui/gtk/about_chrome_dialog.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 3f875005a0ca598a08685c93688ffdcf58e258dd..f836a66bf99455a72dbfc11d411930c1a5b202ab 100644
--- a/chrome/browser/ui/cocoa/about_window_controller.mm
+++ b/chrome/browser/ui/cocoa/about_window_controller.mm
@@ -130,27 +130,11 @@ 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 = chrome::VersionInfo::GetVersionStringModifier();
- if (!modifier.empty())
- versionModifier = [NSString stringWithFormat:@" %@",
- base::SysUTF8ToNSString(modifier)];
-
-#if !defined(GOOGLE_CHROME_BUILD)
- svnRevision = [NSString stringWithFormat:@" (%@)",
- [bundle objectForInfoDictionaryKey:@"SVNRevision"]];
-#endif
// The format string is not localized, but this is how the displayed version
// is built on Windows too.
+ chrome::VersionInfo version_info;
NSString* version =
- [NSString stringWithFormat:@"%@%@%@",
- chromeVersion, svnRevision, versionModifier];
-
+ base::SysUTF8ToNSString(version_info.CreateVersionString());
[version_ setStringValue:version];
// Put the two images into the UI.
« no previous file with comments | « chrome/app/nibs/About.xib ('k') | chrome/browser/ui/gtk/about_chrome_dialog.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698