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

chrome/browser/ui/views/about_chrome_view.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_ABOUT_CHROME_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_ABOUT_CHROME_VIEW_H_
 #pragma once
 
 #include <string>
 
@@ skipping 59 matching lines @@
   virtual bool Accept() OVERRIDE;
   virtual views::View* GetContentsView() OVERRIDE;
 
   // Overridden from views::LinkListener:
   virtual void LinkClicked(views::Link* source, int event_flags) OVERRIDE;
 
 #if defined(OS_WIN) && !defined(USE_AURA)
   // Overridden from GoogleUpdateStatusListener:
   virtual void OnReportResults(GoogleUpdateUpgradeResult result,
                                GoogleUpdateErrorCode error_code,
-                               const std::wstring& version) OVERRIDE;
+                               const string16& error_message,
+                               const string16& version) OVERRIDE;
 #endif
 
  private:
 #if defined(OS_WIN) && !defined(USE_AURA)
   // Update the UI to show the status of the upgrade.
   void UpdateStatus(GoogleUpdateUpgradeResult result,
-                    GoogleUpdateErrorCode error_code);
+                    GoogleUpdateErrorCode error_code,
+                    const string16& error_message);
+
+  // Update the size of the window containing this view to account for more
+  // text being displayed (error messages, etc). Returns how many pixels the
+  // window was increased by (if any).
+  int EnlargeWindowSizeIfNeeded();
 #endif
 
   Profile* profile_;
 
   // UI elements on the dialog.
   views::ImageView* about_dlg_background_logo_;
   views::Label* about_title_label_;
   views::Textfield* version_label_;
   views::Label* copyright_label_;
   views::Label* main_text_label_;
   int main_text_label_height_;
   views::Link* chromium_url_;
   gfx::Rect chromium_url_rect_;
   views::Link* open_source_url_;
   gfx::Rect open_source_url_rect_;
   views::Link* terms_of_service_url_;
   gfx::Rect terms_of_service_url_rect_;
+  views::Label* error_label_;
   // UI elements we add to the parent view.
   scoped_ptr<views::Throbber> throbber_;
   views::ImageView success_indicator_;
   views::ImageView update_available_indicator_;
   views::ImageView timeout_indicator_;
   views::Label update_label_;
 
   // The dialog dimensions.
   gfx::Size dialog_dimensions_;
 
@@ skipping 11 matching lines @@
   // Determines the order of the two links we draw in the main label.
   bool chromium_url_appears_first_;
 
 #if defined(OS_WIN) && !defined(USE_AURA)
   // The class that communicates with Google Update to find out if an update is
   // available and asks it to start an upgrade.
   scoped_refptr<GoogleUpdate> google_updater_;
 #endif
 
   // The version Google Update reports is available to us.
-  std::wstring new_version_available_;
+  string16 new_version_available_;
 
   // Whether text direction is left-to-right or right-to-left.
   bool text_direction_is_rtl_;
 
   DISALLOW_COPY_AND_ASSIGN(AboutChromeView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_ABOUT_CHROME_VIEW_H_