diff options
| author | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-19 02:07:02 +0000 |
|---|---|---|
| committer | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-19 02:07:02 +0000 |
| commit | 44ba8b4dfbaf1d436d23c52a7d8194afd3f21004 (patch) | |
| tree | bead17ec4d207bbc531a13c1a4bfc892af301749 /chrome | |
| parent | 42d7510ca7ff39e85e1d12be939cf0b213058bd3 (diff) | |
| download | chromium_src-44ba8b4dfbaf1d436d23c52a7d8194afd3f21004.zip chromium_src-44ba8b4dfbaf1d436d23c52a7d8194afd3f21004.tar.gz chromium_src-44ba8b4dfbaf1d436d23c52a7d8194afd3f21004.tar.bz2 | |
Remove svn revision from branded builds.
BUG=htp://crbug.com/30173
Review URL: http://codereview.chromium.org/504065
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35029 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/cocoa/about_window_controller.mm | 8 | ||||
| -rw-r--r-- | chrome/browser/gtk/about_chrome_dialog.cc | 2 | ||||
| -rwxr-xr-x | chrome/browser/views/about_chrome_view.cc | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/chrome/browser/cocoa/about_window_controller.mm b/chrome/browser/cocoa/about_window_controller.mm index 77c3272..edaf9cb 100644 --- a/chrome/browser/cocoa/about_window_controller.mm +++ b/chrome/browser/cocoa/about_window_controller.mm @@ -129,16 +129,20 @@ static BOOL recentShownUserActionFailedStatus = NO; [bundle objectForInfoDictionaryKey:@"CFBundleShortVersionString"]; NSString* versionModifier = @""; + NSString* svnRevision = @""; string16 modifier = platform_util::GetVersionStringModifier(); if (modifier.length()) versionModifier = [NSString stringWithFormat:@" %@", base::SysUTF16ToNSString(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. - NSString* svnRevision = [bundle objectForInfoDictionaryKey:@"SVNRevision"]; NSString* version = - [NSString stringWithFormat:@"%@ (%@)%@", + [NSString stringWithFormat:@"%@%@%@", chromeVersion, svnRevision, versionModifier]; [version_ setStringValue:version]; diff --git a/chrome/browser/gtk/about_chrome_dialog.cc b/chrome/browser/gtk/about_chrome_dialog.cc index 34195e8..c17f084 100644 --- a/chrome/browser/gtk/about_chrome_dialog.cc +++ b/chrome/browser/gtk/about_chrome_dialog.cc @@ -106,9 +106,11 @@ void ShowAboutDialogForProfile(GtkWindow* parent, Profile* profile) { scoped_ptr<FileVersionInfo> version_info( FileVersionInfo::CreateFileVersionInfoForCurrentModule()); std::wstring current_version = version_info->file_version(); +#if !defined(GOOGLE_CHROME_BUILD) current_version += L" ("; current_version += version_info->last_change(); current_version += L")"; +#endif string16 version_modifier = platform_util::GetVersionStringModifier(); if (version_modifier.length()) { current_version += L" "; diff --git a/chrome/browser/views/about_chrome_view.cc b/chrome/browser/views/about_chrome_view.cc index b73d878..363066a 100755 --- a/chrome/browser/views/about_chrome_view.cc +++ b/chrome/browser/views/about_chrome_view.cc @@ -137,9 +137,11 @@ void AboutChromeView::Init() { } current_version_ = version_info->file_version(); +#if !defined(GOOGLE_CHROME_BUILD) current_version_ += L" ("; current_version_ += version_info->last_change(); current_version_ += L")"; +#endif string16 version_modifier = platform_util::GetVersionStringModifier(); if (version_modifier.length()) { |