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

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

Issue 7248049: Unify the version string to be displayed on "About Chromium" dialog. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 6 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 e0efd1924e5d0166ef1065d940f84fdcd74aaa89..89d255049c9df547e80f49a0b92959a90cbd3110 100644
--- a/chrome/browser/ui/cocoa/about_window_controller.mm
+++ b/chrome/browser/ui/cocoa/about_window_controller.mm
@@ -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 = chrome::VersionInfo::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];
« 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