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

Unified Diff: chrome/browser/ui/gtk/about_chrome_dialog.cc

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/browser/ui/cocoa/about_window_controller.mm ('k') | chrome/common/chrome_version_info.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/gtk/about_chrome_dialog.cc
diff --git a/chrome/browser/ui/gtk/about_chrome_dialog.cc b/chrome/browser/ui/gtk/about_chrome_dialog.cc
index e2d40a58c7ff7ddb7a80700a521c45bbd098bcba..a1d06a55c1e2cc7e5f7a8712e12e2cc69c22f321 100644
--- a/chrome/browser/ui/gtk/about_chrome_dialog.cc
+++ b/chrome/browser/ui/gtk/about_chrome_dialog.cc
@@ -102,22 +102,6 @@ gboolean OnEventBoxExpose(GtkWidget* event_box,
void ShowAboutDialogForProfile(GtkWindow* parent, Profile* profile) {
ResourceBundle& rb = ResourceBundle::GetSharedInstance();
static GdkPixbuf* background = rb.GetNativeImageNamed(IDR_ABOUT_BACKGROUND);
- chrome::VersionInfo version_info;
- std::string current_version = version_info.Version();
-#if !defined(GOOGLE_CHROME_BUILD)
- current_version += " (";
- current_version += l10n_util::GetStringUTF8(
- version_info.IsOfficialBuild() ?
- IDS_ABOUT_VERSION_OFFICIAL : IDS_ABOUT_VERSION_UNOFFICIAL);
- current_version += " ";
- current_version += version_info.LastChange();
- current_version += " ";
- current_version += version_info.OSType();
- current_version += ")";
-#endif
- std::string channel = chrome::VersionInfo::GetVersionStringModifier();
- if (!channel.empty())
- current_version += " " + channel;
// Build the dialog.
GtkWidget* dialog = gtk_dialog_new_with_buttons(
@@ -157,7 +141,9 @@ void ShowAboutDialogForProfile(GtkWindow* parent, Profile* profile) {
gtk_widget_modify_fg(product_label, GTK_STATE_NORMAL, &black);
gtk_box_pack_start(GTK_BOX(text_vbox), product_label, FALSE, FALSE, 0);
- GtkWidget* version_label = gtk_label_new(current_version.c_str());
+ chrome::VersionInfo version_info;
+ GtkWidget* version_label = gtk_label_new(
+ version_info.CreateVersionString().c_str());
gtk_misc_set_alignment(GTK_MISC(version_label), 0.0, 0.5);
gtk_label_set_selectable(GTK_LABEL(version_label), TRUE);
gtk_widget_modify_fg(version_label, GTK_STATE_NORMAL, &black);
« no previous file with comments | « chrome/browser/ui/cocoa/about_window_controller.mm ('k') | chrome/common/chrome_version_info.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698