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

chrome/browser/ui/views/about_chrome_view.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/views/about_chrome_view.h"
 
 #if defined(OS_WIN)
 #include <commdlg.h>
 #endif  // defined(OS_WIN)
 
@@ skipping 38 matching lines @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/ui/views/restart_message_box.h"
 #include "chrome/installer/util/install_util.h"
 #endif  // defined(OS_WIN)
 
 namespace {
 // The pixel width of the version text field. Ideally, we'd like to have the
 // bounds set to the edge of the icon. However, the icon is not a view but a
 // part of the background, so we have to hard code the width to make sure
 // the version field doesn't overlap it.
-const int kVersionFieldWidth = 195;
+const int kVersionFieldWidth = 290;
 
 // These are used as placeholder text around the links in the text in the about
 // dialog.
 const wchar_t* kBeginLink = L"BEGIN_LINK";
 const wchar_t* kEndLink = L"END_LINK";
 const wchar_t* kBeginLinkChr = L"BEGIN_LINK_CHR";
 const wchar_t* kBeginLinkOss = L"BEGIN_LINK_OSS";
 const wchar_t* kEndLinkChr = L"END_LINK_CHR";
 const wchar_t* kEndLinkOss = L"END_LINK_OSS";
 
@@ skipping 27 matching lines @@
 }  // namespace browser
 
 ////////////////////////////////////////////////////////////////////////////////
 // AboutChromeView, public:
 
 AboutChromeView::AboutChromeView(Profile* profile)
     : profile_(profile),
       about_dlg_background_logo_(NULL),
       about_title_label_(NULL),
       version_label_(NULL),
-      os_version_label_(NULL),
       copyright_label_(NULL),
       main_text_label_(NULL),
       main_text_label_height_(0),
       chromium_url_(NULL),
       open_source_url_(NULL),
       terms_of_service_url_(NULL),
       restart_button_visible_(false),
       chromium_url_appears_first_(true),
       text_direction_is_rtl_(false) {
   DCHECK(profile);
@@ skipping 17 matching lines @@
   // need to let it know that we will no longer be listening.
   if (google_updater_)
     google_updater_->set_status_listener(NULL);
 #endif
 }
 
 void AboutChromeView::Init() {
   text_direction_is_rtl_ = base::i18n::IsRTL();
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
 
-  chrome::VersionInfo version_info;
-  if (!version_info.is_valid()) {
-    NOTREACHED() << L"Failed to initialize about window";
-    return;
-  }
-
-  current_version_ = version_info.Version();
-
-  // This code only runs as a result of the user opening the About box so
-  // doing registry access to get the version string modifier should be fine.
-  base::ThreadRestrictions::ScopedAllowIO allow_io;
-  std::string version_modifier = platform_util::GetVersionStringModifier();
-  if (!version_modifier.empty())
-    version_details_ += " " + version_modifier;
-
-#if !defined(GOOGLE_CHROME_BUILD)
-  version_details_ += " (";
-  version_details_ += l10n_util::GetStringUTF8(
-      version_info.IsOfficialBuild() ?
-      IDS_ABOUT_VERSION_OFFICIAL : IDS_ABOUT_VERSION_UNOFFICIAL);
-  version_details_ += " ";
-  version_details_ += version_info.LastChange();
-  version_details_ += ")";
-#endif
-
   // Views we will add to the *parent* of this dialog, since it will display
   // next to the buttons which we don't draw ourselves.
   throbber_.reset(new views::Throbber(50, true));
   throbber_->set_parent_owned(false);
   throbber_->SetVisible(false);
 
   SkBitmap* success_image = rb.GetBitmapNamed(IDR_UPDATE_UPTODATE);
   success_indicator_.SetImage(*success_image);
   success_indicator_.set_parent_owned(false);
 
@@ skipping 22 matching lines @@
   // Add the dialog labels.
   about_title_label_ = new views::Label(
       UTF16ToWide(l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
   about_title_label_->SetFont(ResourceBundle::GetSharedInstance().GetFont(
       ResourceBundle::BaseFont).DeriveFont(18));
   about_title_label_->SetColor(SK_ColorBLACK);
   AddChildView(about_title_label_);
 
   // This is a text field so people can copy the version number from the dialog.
   version_label_ = new views::Textfield();
-  version_label_->SetText(ASCIIToUTF16(current_version_ + version_details_));
+  chrome::VersionInfo version_info;
+  version_label_->SetText(UTF8ToUTF16(version_info.CreateVersionString()));
   version_label_->SetReadOnly(true);
   version_label_->RemoveBorder();
   version_label_->SetTextColor(SK_ColorBLACK);
   version_label_->SetBackgroundColor(SK_ColorWHITE);
   version_label_->SetFont(ResourceBundle::GetSharedInstance().GetFont(
       ResourceBundle::BaseFont));
   AddChildView(version_label_);
 
-  os_version_label_ = new views::Textfield();
-  os_version_label_->SetText(UTF8ToUTF16(version_info.OSType()));
-  os_version_label_->SetReadOnly(true);
-  os_version_label_->RemoveBorder();
-  os_version_label_->SetTextColor(SK_ColorBLACK);
-  os_version_label_->SetBackgroundColor(SK_ColorWHITE);
-  os_version_label_->SetFont(ResourceBundle::GetSharedInstance().GetFont(
-      ResourceBundle::BaseFont));
-  AddChildView(os_version_label_);
-
   // The copyright URL portion of the main label.
   copyright_label_ = new views::Label(
       UTF16ToWide(l10n_util::GetStringUTF16(IDS_ABOUT_VERSION_COPYRIGHT)));
   copyright_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   AddChildView(copyright_label_);
 
   main_text_label_ = new views::Label(L"");
 
   // Figure out what to write in the main label of the About box.
   std::wstring text =
@@ skipping 107 matching lines @@
 
   // Then we have the version number right below it.
   sz = version_label_->GetPreferredSize();
   version_label_->SetBounds(views::kPanelHorizMargin,
                             about_title_label_->y() +
                                 about_title_label_->height() +
                                 views::kRelatedControlVerticalSpacing,
                             kVersionFieldWidth,
                             sz.height());
 
-  // Then we have the version number right below it.
-  sz = os_version_label_->GetPreferredSize();
-  os_version_label_->SetBounds(
-      views::kPanelHorizMargin,
-      version_label_->y() +
-          version_label_->height() +
-          views::kRelatedControlVerticalSpacing,
-      kVersionFieldWidth,
-      sz.height());
-
   // For the width of the main text label we want to use up the whole panel
   // width and remaining height, minus a little margin on each side.
   int y_pos = background_image_height + views::kRelatedControlVerticalSpacing;
   sz.set_width(panel_size.width() - 2 * views::kPanelHorizMargin);
 
   // Draw the text right below the background image.
   copyright_label_->SetBounds(views::kPanelHorizMargin,
                               y_pos,
                               sz.width(),
                               sz.height());
@@ skipping 328 matching lines @@
       // The extra version check is necessary on Windows because the application
       // may be already up to date on disk though the running app is still
       // out of date. Chrome OS doesn't quite have this issue since the
       // OS/App are updated together. If a newer version of the OS has been
       // staged then UPGRADE_SUCESSFUL will be returned.
       // Google Update reported that Chrome is up-to-date. Now make sure that we
       // are running the latest version and if not, notify the user by falling
       // into the next case of UPGRADE_SUCCESSFUL.
       BrowserDistribution* dist = BrowserDistribution::GetDistribution();
       base::ThreadRestrictions::ScopedAllowIO allow_io;
+      chrome::VersionInfo version_info;
+      if (!version_info.is_valid()) {

[tony, 2011/06/14 18:56:31]

Why do we have this check here?  We don't seem to call is_valid() when we
instantiate VersionInfo in other places.

[haraken1, 2011/06/15 04:20:41]

I removed it. 

+        NOTREACHED() << L"Failed to initialize about window";
+        return;
+      }
       scoped_ptr<Version> installed_version(
           InstallUtil::GetChromeVersion(dist, false));
       if (!installed_version.get()) {
         // User-level Chrome is not installed, check system-level.
         installed_version.reset(InstallUtil::GetChromeVersion(dist, true));
       }
       scoped_ptr<Version> running_version(
-          Version::GetVersionFromString(current_version_));
+          Version::GetVersionFromString(version_info.Version()));
       if (!installed_version.get() ||
           (installed_version->CompareTo(*running_version) <= 0)) {
         UserMetrics::RecordAction(
             UserMetricsAction("UpgradeCheck_AlreadyUpToDate"));
         std::wstring update_label_text = l10n_util::GetStringFUTF16(
             IDS_UPGRADE_ALREADY_UP_TO_DATE,
             l10n_util::GetStringUTF16(IDS_PRODUCT_NAME),
-            ASCIIToUTF16(current_version_));
+            ASCIIToUTF16(version_info.Version()));
         if (base::i18n::IsRTL()) {
           update_label_text.push_back(
               static_cast<wchar_t>(base::i18n::kLeftToRightMark));
         }
         update_label_.SetText(update_label_text);
         show_success_indicator = true;
         break;
       }
       // No break here as we want to notify user about upgrade if there is one.
     }
@@ skipping 41 matching lines @@
   // We have updated controls on the parent, so we need to update its layout.
   parent()->Layout();
 
   // Check button may have appeared/disappeared. We cannot call this during
   // ViewHierarchyChanged because the |window()| pointer hasn't been set yet.
   if (window())
     GetDialogClientView()->UpdateDialogButtons();
 }
 
 #endif