Pass through installer errors from Google Update to the About box.

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 32 matching lines @@
 #include "views/widget/widget.h"
 #include "webkit/glue/webkit_glue.h"
 
 #if defined(OS_WIN)
 #include "base/win/win_util.h"
 #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)
 
+// The amount of vertical space separating the error label at the bottom from
+// the rest of the text.
+static const int kErrorLabelVerticalSpacing = 15;  // Pixels.
+
 namespace {
 // These are used as placeholder text around the links in the text in the about
 // dialog.
 const string16 kBeginLink(ASCIIToUTF16("BEGIN_LINK"));
 const string16 kEndLink(ASCIIToUTF16("END_LINK"));
 const string16 kBeginLinkChr(ASCIIToUTF16("BEGIN_LINK_CHR"));
 const string16 kBeginLinkOss(ASCIIToUTF16("BEGIN_LINK_OSS"));
 const string16 kEndLinkChr(ASCIIToUTF16("END_LINK_CHR"));
 const string16 kEndLinkOss(ASCIIToUTF16("END_LINK_OSS"));
 
@@ skipping 95 matching lines @@
       l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
   about_title_label_->SetFont(ResourceBundle::GetSharedInstance().GetFont(
       ResourceBundle::BaseFont).DeriveFont(18));
   about_title_label_->SetBackgroundColor(SK_ColorWHITE);
   about_title_label_->SetEnabledColor(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();
   chrome::VersionInfo version_info;
-  version_label_->SetText(UTF8ToUTF16(version_info.CreateVersionString()));
+  {
+    // TODO(finnur): Need to evaluate whether we should be doing IO here.
+    //               See issue: http://crbug.com/101699.
+    base::ThreadRestrictions::ScopedAllowIO allow_io;
+    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_);
 
   // The copyright URL portion of the main label.
   copyright_label_ = new views::Label(
       l10n_util::GetStringUTF16(IDS_ABOUT_VERSION_COPYRIGHT));
   copyright_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   AddChildView(copyright_label_);
 
   main_text_label_ = new views::Label(string16());
 
   // Figure out what to write in the main label of the About box.
   string16 text = l10n_util::GetStringUTF16(IDS_ABOUT_VERSION_LICENSE);
 
   chromium_url_appears_first_ =
       text.find(kBeginLinkChr) < text.find(kBeginLinkOss);
 
   size_t link1 = text.find(kBeginLink);
-  DCHECK(link1 != std::wstring::npos);
+  DCHECK(link1 != string16::npos);
   size_t link1_end = text.find(kEndLink, link1);
-  DCHECK(link1_end != std::wstring::npos);
+  DCHECK(link1_end != string16::npos);
   size_t link2 = text.find(kBeginLink, link1_end);
-  DCHECK(link2 != std::wstring::npos);
+  DCHECK(link2 != string16::npos);
   size_t link2_end = text.find(kEndLink, link2);
-  DCHECK(link1_end != std::wstring::npos);
+  DCHECK(link1_end != string16::npos);
 
   main_label_chunk1_ = text.substr(0, link1);
   main_label_chunk2_ = StringSubRange(text, link1_end + kEndLinkOss.size(),
                                       link2);
   main_label_chunk3_ = text.substr(link2_end + kEndLinkOss.size());
 
   // The Chromium link within the main text of the dialog.
   chromium_url_ = new views::Link(
       StringSubRange(text, text.find(kBeginLinkChr) + kBeginLinkChr.size(),
                      text.find(kEndLinkChr)));
@@ skipping 51 matching lines @@
 
   main_label_chunk4_ = text.substr(0, url_offsets[0]);
   main_label_chunk5_ = text.substr(url_offsets[0]);
 
   // The Terms of Service URL at the bottom.
   terms_of_service_url_ = new views::Link(
       l10n_util::GetStringUTF16(IDS_TERMS_OF_SERVICE));
   AddChildView(terms_of_service_url_);
   terms_of_service_url_->set_listener(this);
 
+  error_label_ = new views::Label();
+  error_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
+  error_label_->SetMultiLine(true);
+  AddChildView(error_label_);
+
   // Add the Terms of Service line and some whitespace.
   height += font.GetHeight() + views::kRelatedControlVerticalSpacing;
 #endif
 
   // Use whichever is greater (the calculated height or the specified minimum
   // height).
   dialog_dimensions_.set_height(std::max(height, dialog_dimensions_.height()));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ skipping 40 matching lines @@
                               sz.width(),
                               sz.height());
 
   // Then the main_text_label.
   main_text_label_->SetBounds(views::kPanelHorizMargin,
                               copyright_label_->y() +
                                   copyright_label_->height(),
                               sz.width(),
                               main_text_label_height_);
 
+  // And the error label at the bottom of the main content. This does not fit on
+  // screen until EnlargeWindowSizeIfNeeded has been called (which happens when
+  // an error is returned from Google Update).
+  sz.set_height(error_label_->GetHeightForWidth(sz.width()));
+  error_label_->SetBounds(main_text_label_->bounds().x(),
+                          main_text_label_->bounds().y() +
+                              main_text_label_->height() +
+                              kErrorLabelVerticalSpacing,
+                          sz.width(), sz.height());
+
   // Get the y-coordinate of our parent so we can position the text left of the
   // buttons at the bottom.
   gfx::Rect parent_bounds = parent()->GetContentsBounds();
 
   sz = throbber_->GetPreferredSize();
   int throbber_topleft_x = views::kPanelHorizMargin;
   int throbber_topleft_y =
       parent_bounds.bottom() - sz.height() - views::kButtonVEdgeMargin - 3;
   throbber_->SetBounds(throbber_topleft_x, throbber_topleft_y,
                        sz.width(), sz.height());
@@ skipping 137 matching lines @@
 
 #if defined(OS_WIN) && !defined(USE_AURA)
       // On-demand updates for Chrome don't work in Vista RTM when UAC is turned
       // off. So, in this case we just want the About box to not mention
       // on-demand updates. Silent updates (in the background) should still
       // work as before - enabling UAC or installing the latest service pack
       // for Vista is another option.
       if (!(base::win::GetVersion() == base::win::VERSION_VISTA &&
             (base::win::OSInfo::GetInstance()->service_pack().major == 0) &&
             !base::win::UserAccountControlIsEnabled())) {
-        UpdateStatus(UPGRADE_CHECK_STARTED, GOOGLE_UPDATE_NO_ERROR);
+        UpdateStatus(UPGRADE_CHECK_STARTED, GOOGLE_UPDATE_NO_ERROR, string16());
         // CheckForUpdate(false, ...) means don't upgrade yet.
         google_updater_->CheckForUpdate(false, GetWidget());
       }
 #endif
     } else {
       parent->RemoveChildView(&update_label_);
       parent->RemoveChildView(throbber_.get());
       parent->RemoveChildView(&success_indicator_);
       parent->RemoveChildView(&update_available_indicator_);
       parent->RemoveChildView(&timeout_indicator_);
@@ skipping 88 matching lines @@
   Browser* browser = BrowserList::GetLastActiveWithProfile(profile_);
   browser->OpenURL(url, GURL(), NEW_WINDOW, content::PAGE_TRANSITION_LINK);
 }
 
 #if defined(OS_WIN) && !defined(USE_AURA)
 ////////////////////////////////////////////////////////////////////////////////
 // AboutChromeView, GoogleUpdateStatusListener implementation:
 
 void AboutChromeView::OnReportResults(GoogleUpdateUpgradeResult result,
                                       GoogleUpdateErrorCode error_code,
+                                      const string16& error_message,
                                       const string16& version) {
   // Drop the last reference to the object so that it gets cleaned up here.
   google_updater_ = NULL;
 
   // Make a note of which version Google Update is reporting is the latest
   // version.
   new_version_available_ = version;
-  UpdateStatus(result, error_code);
+  UpdateStatus(result, error_code, error_message);
 }
 ////////////////////////////////////////////////////////////////////////////////
 // AboutChromeView, private:
 
 void AboutChromeView::UpdateStatus(GoogleUpdateUpgradeResult result,
-                                   GoogleUpdateErrorCode error_code) {
+                                   GoogleUpdateErrorCode error_code,
+                                   const string16& error_message) {
 #if !defined(GOOGLE_CHROME_BUILD)
   // For Chromium builds it would show an error message.
   // But it looks weird because in fact there is no error,
   // just the update server is not available for non-official builds.
   return;
 #endif
   bool show_success_indicator = false;
   bool show_update_available_indicator = false;
   bool show_timeout_indicator = false;
   bool show_throbber = false;
@@ skipping 11 matching lines @@
       show_throbber = true;
       update_label_.SetText(
           UTF16ToWide(l10n_util::GetStringUTF16(IDS_UPGRADE_CHECK_STARTED)));
       break;
     case UPGRADE_IS_AVAILABLE:
       UserMetrics::RecordAction(
           UserMetricsAction("UpgradeCheck_UpgradeIsAvailable"));
       DCHECK(!google_updater_);  // Should have been nulled out already.
       google_updater_ = new GoogleUpdate();
       google_updater_->set_status_listener(this);
-      UpdateStatus(UPGRADE_STARTED, GOOGLE_UPDATE_NO_ERROR);
+      UpdateStatus(UPGRADE_STARTED, GOOGLE_UPDATE_NO_ERROR, string16());
       // CheckForUpdate(true,...) means perform upgrade if new version found.
       google_updater_->CheckForUpdate(true, GetWidget());
       // TODO(seanparent): Need to see if this code needs to change to
       // force a machine restart.
       return;
     case UPGRADE_ALREADY_UP_TO_DATE: {
       // 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;
       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(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(
+        string16 update_label_text = l10n_util::GetStringFUTF16(
             IDS_UPGRADE_ALREADY_UP_TO_DATE,
             l10n_util::GetStringUTF16(IDS_PRODUCT_NAME),
             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.
     }
     case UPGRADE_SUCCESSFUL: {
       if (result == UPGRADE_ALREADY_UP_TO_DATE)
         UserMetrics::RecordAction(
             UserMetricsAction("UpgradeCheck_AlreadyUpgraded"));
       else
         UserMetrics::RecordAction(UserMetricsAction("UpgradeCheck_Upgraded"));
       restart_button_visible_ = true;
-      const std::wstring& update_string =
+      const string16& update_string =
           UTF16ToWide(l10n_util::GetStringFUTF16(
               IDS_UPGRADE_SUCCESSFUL_RELAUNCH,
               l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
       update_label_.SetText(update_string);
       show_success_indicator = true;
       break;
     }
-    case UPGRADE_ERROR:
+    case UPGRADE_ERROR: {
       UserMetrics::RecordAction(UserMetricsAction("UpgradeCheck_Error"));
+      if (!error_message.empty()) {
+        error_label_->SetText(
+            l10n_util::GetStringFUTF16(IDS_ABOUT_BOX_ERROR_DURING_UPDATE_CHECK,
+                error_message));
+        int added_height = EnlargeWindowSizeIfNeeded();
+        dialog_dimensions_.set_height(dialog_dimensions_.height() +
+                                      added_height);
+      }
       restart_button_visible_ = false;
       if (error_code != GOOGLE_UPDATE_DISABLED_BY_POLICY) {
         update_label_.SetText(
             l10n_util::GetStringFUTF16Int(IDS_UPGRADE_ERROR, error_code));
       } else {
         update_label_.SetText(
             l10n_util::GetStringUTF16(IDS_UPGRADE_DISABLED_BY_POLICY));
       }
       show_timeout_indicator = true;
       break;
+    }
     default:
       NOTREACHED();
   }
 
   success_indicator_.SetVisible(show_success_indicator);
   update_available_indicator_.SetVisible(show_update_available_indicator);
   timeout_indicator_.SetVisible(show_timeout_indicator);
   update_label_.SetVisible(show_update_label);
   throbber_->SetVisible(show_throbber);
   if (show_throbber)
     throbber_->Start();
   else
     throbber_->Stop();
 
   // 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 view hasn't been added to a Widget yet.
   if (GetWidget())
     GetDialogClientView()->UpdateDialogButtons();
 }
 
+int AboutChromeView::EnlargeWindowSizeIfNeeded() {
+  if (error_label_->GetText().empty())
+    return 0;
+
+  // This will enlarge the window each time the function is called, which is
+  // fine since we only receive status once from Google Update.
+  gfx::Rect window_rect = GetWidget()->GetWindowScreenBounds();
+  int height = error_label_->GetHeightForWidth(
+      dialog_dimensions_.width() - (2 * views::kPanelHorizMargin)) +
+          views::kRelatedControlVerticalSpacing;
+  window_rect.set_height(window_rect.height() + height);
+  GetWidget()->SetBounds(window_rect);
+
+  return height;
+}
+
 #endif