Unify the version string to be displayed on "About Chromium" dialog.

chrome/browser/ui/gtk/about_chrome_dialog.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/gtk/about_chrome_dialog.h"
 
 #include <gtk/gtk.h>
 
 #include <string>
 #include <vector>
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/google/google_util.h"
-#include "chrome/browser/platform_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/gtk/cairo_cached_surface.h"
 #include "chrome/browser/ui/gtk/gtk_chrome_link_button.h"
 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/url_constants.h"
 #include "grit/chromium_strings.h"
@@ skipping 71 matching lines @@
   cairo_fill(cr);
   cairo_destroy(cr);
   return FALSE;
 }
 
 }  // namespace
 
 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 = platform_util::GetVersionStringModifier();
-  if (!channel.empty())
-    current_version += " " + channel;
 
   // Build the dialog.
   GtkWidget* dialog = gtk_dialog_new_with_buttons(
       l10n_util::GetStringUTF8(IDS_ABOUT_CHROME_TITLE).c_str(),
       parent,
       GTK_DIALOG_MODAL,
       NULL);
   // Pick up the style set in gtk_util.cc:InitRCStyles().
   // The layout of this dialog is special because the logo should be flush
   // with the edges of the window.
@@ skipping 19 matching lines @@
 
   GtkWidget* text_vbox = gtk_vbox_new(FALSE, kExtraLineSpacing);
 
   GdkColor black = gtk_util::kGdkBlack;
   GtkWidget* product_label = MakeMarkupLabel(
       "<span font_desc=\"18\" style=\"normal\">%s</span>",
       l10n_util::GetStringUTF8(IDS_PRODUCT_NAME));
   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);
   gtk_box_pack_start(GTK_BOX(text_vbox), version_label, FALSE, FALSE, 0);
 
   gtk_container_add(GTK_CONTAINER(text_alignment), text_vbox);
   gtk_box_pack_start(GTK_BOX(hbox), text_alignment, TRUE, TRUE, 0);
 
   GtkWidget* image_vbox = gtk_vbox_new(FALSE, 0);
   gtk_box_pack_end(GTK_BOX(image_vbox),
@@ skipping 113 matching lines @@
       gtk_util::kContentAreaBorder, 0,
       gtk_util::kContentAreaBorder, gtk_util::kContentAreaBorder);
   gtk_container_add(GTK_CONTAINER(alignment), vbox);
   gtk_box_pack_start(GTK_BOX(content_area), alignment, FALSE, FALSE, 0);
 
   g_signal_connect(dialog, "response", G_CALLBACK(OnResponse), NULL);
   gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
   gtk_widget_show_all(dialog);
   gtk_widget_grab_focus(close_button);
 }