summaryrefslogtreecommitdiffstats
path: root/chrome/browser/gtk/about_chrome_dialog.cc
diff options
context:
space:
mode:
authormmoss@google.com <mmoss@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-15 21:40:29 +0000
committermmoss@google.com <mmoss@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-15 21:40:29 +0000
commit01de0ce020b982f597ef6afe2b73cc2f275a7227 (patch)
tree810f92b3c468e6dc0aad3a09886c92b8c4bee06d /chrome/browser/gtk/about_chrome_dialog.cc
parent5ef3f544a256a572d90dd9aae0eba58a08667eef (diff)
downloadchromium_src-01de0ce020b982f597ef6afe2b73cc2f275a7227.zip
chromium_src-01de0ce020b982f597ef6afe2b73cc2f275a7227.tar.gz
chromium_src-01de0ce020b982f597ef6afe2b73cc2f275a7227.tar.bz2
Support custom Linux version strings (e.g. release channel, downstream vendor name, etc.).
Also reformat the Mac/Win version strings as per comments in http://codereview.chromium.org/506007. Review URL: http://codereview.chromium.org/506016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34609 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk/about_chrome_dialog.cc')
-rw-r--r--chrome/browser/gtk/about_chrome_dialog.cc8
1 files changed, 6 insertions, 2 deletions
diff --git a/chrome/browser/gtk/about_chrome_dialog.cc b/chrome/browser/gtk/about_chrome_dialog.cc
index d840d9e..34195e8 100644
--- a/chrome/browser/gtk/about_chrome_dialog.cc
+++ b/chrome/browser/gtk/about_chrome_dialog.cc
@@ -17,6 +17,7 @@
#include "chrome/browser/profile.h"
#include "chrome/common/chrome_constants.h"
#include "chrome/common/gtk_util.h"
+#include "chrome/common/platform_util.h"
#include "chrome/common/url_constants.h"
#include "grit/chromium_strings.h"
#include "grit/generated_resources.h"
@@ -105,11 +106,14 @@ 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" ";
+ current_version += UTF16ToWide(version_modifier);
+ }
// Build the dialog.
GtkWidget* dialog = gtk_dialog_new_with_buttons(