Cleanup of about box

chrome/browser/views/about_chrome_view.cc

 // Copyright (c) 2010 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/views/about_chrome_view.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/callback.h"
 #include "base/file_version_info.h"
@@ skipping 190 matching lines @@
   version_label_->SetText(WideToUTF16Hack(current_version_ + version_details_));
   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_);
 
 #if defined(OS_CHROMEOS)
-  os_version_label_ = new views::Textfield();
+  os_version_label_ = new views::Textfield(views::Textfield::STYLE_MULTILINE);
   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_);
 #endif
 
   // The copyright URL portion of the main label.
@@ skipping 358 matching lines @@
 bool AboutChromeView::IsDialogButtonVisible(
     MessageBoxFlags::DialogButton button) const {
   if (button == MessageBoxFlags::DIALOGBUTTON_OK &&
       check_button_status_ == CHECKBUTTON_HIDDEN) {
     return false;
   }
 
   return true;
 }
 
+// (on ChromeOS) the default focus is ending up in the version field when
+// the update button is hidden. This forces the focus to always be on the
+// OK button (which is the dialog cancel button, see GetDialogButtonLabel
+// above).
+int AboutChromeView::GetDefaultDialogButton() const {
+  return MessageBoxFlags::DIALOGBUTTON_CANCEL;
+}
+
 bool AboutChromeView::CanResize() const {
   return false;
 }
 
 bool AboutChromeView::CanMaximize() const {
   return false;
 }
 
 bool AboutChromeView::IsAlwaysOnTop() const {
   return false;
@@ skipping 48 matching lines @@
   browser->OpenURL(url, GURL(), NEW_FOREGROUND_TAB, PageTransition::LINK);
 #else
   browser->OpenURL(url, GURL(), NEW_WINDOW, PageTransition::LINK);
 #endif
 }
 
 #if defined(OS_CHROMEOS)
 void AboutChromeView::OnOSVersion(
     chromeos::VersionLoader::Handle handle,
     std::string version) {
+
+  // This is a hack to "wrap" the very long Test Build version after
+  // the version number, the remaining text won't be visible but can
+  // be selected, copied, pasted.
+  std::string::size_type pos = version.find(" (Test Build");
+  if (pos != std::string::npos)
+    version.replace(pos, 1, "\n");
+
   os_version_label_->SetText(UTF8ToUTF16(version));
 }
 #endif
 
 #if defined(OS_WIN) || defined(OS_CHROMEOS)
 ////////////////////////////////////////////////////////////////////////////////
 // AboutChromeView, GoogleUpdateStatusListener implementation:
 
 void AboutChromeView::OnReportResults(GoogleUpdateUpgradeResult result,
                                       GoogleUpdateErrorCode error_code,
@@ skipping 59 matching lines @@
       scoped_ptr<installer::Version> installed_version(
           InstallUtil::GetChromeVersion(false));
       scoped_ptr<installer::Version> running_version(
           installer::Version::GetVersionFromString(current_version_));
       if (!installed_version.get() ||
           !installed_version->IsHigherThan(running_version.get())) {
 #endif
         UserMetrics::RecordAction(
             UserMetricsAction("UpgradeCheck_AlreadyUpToDate"), profile_);
         check_button_status_ = CHECKBUTTON_HIDDEN;
+#if defined(OS_CHROMEOS)
+        std::wstring update_label_text =
+            l10n_util::GetStringF(IDS_UPGRADE_ALREADY_UP_TO_DATE,
+                                  l10n_util::GetString(IDS_PRODUCT_NAME));
+#else
         std::wstring update_label_text =
             l10n_util::GetStringF(IDS_UPGRADE_ALREADY_UP_TO_DATE,
                                   l10n_util::GetString(IDS_PRODUCT_NAME),
                                   current_version_);
+#endif
         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;
 #if defined(OS_WIN)
       }
 #endif
@@ skipping 48 matching lines @@
   View* parent = GetParent();
   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