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

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: Modify nib files using Interface Builder 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
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..05448f21348e9395807b9d707e40978c088ab28b 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());
Mark Mentovai 2011/07/18 02:20:17 4-space indent on continuation lines.
haraken1 2011/07/19 04:36:35 Done.
[version_ setStringValue:version];
// Put the two images into the UI.

Powered by Google App Engine
This is Rietveld 408576698