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

chrome/browser/google/google_update.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_GOOGLE_GOOGLE_UPDATE_H_
 #define CHROME_BROWSER_GOOGLE_GOOGLE_UPDATE_H_
 #pragma once
 
-#include <string>
-
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
+#include "base/string16.h"
 #if defined(OS_WIN)
 #include "google_update_idl.h"
 #endif
 
 class MessageLoop;
 namespace views {
 class Widget;
 }
 
 // The status of the upgrade. UPGRADE_STARTED and UPGRADE_CHECK_STARTED are
@@ skipping 37 matching lines @@
   // Updates can not be downloaded because the administrator has disabled them.
   GOOGLE_UPDATE_DISABLED_BY_POLICY,
 };
 
 // The GoogleUpdateStatusListener interface is used by components to receive
 // notifications about the results of an Google Update operation.
 class GoogleUpdateStatusListener {
  public:
   // This function is called when Google Update has finished its operation and
   // wants to notify us about the results. |results| represents what the end
-  // state is, |error_code| represents what error occurred and |version|
-  // specifies what new version Google Update detected (or installed). This
-  // value can be a blank string, if the version tag in the Update{} block
-  // (in Google Update's server config for Chrome) is blank.
+  // state is, |error_code| represents what error occurred, |error_message| is a
+  // string version of the same (might be blank) and |version| specifies what
+  // new version Google Update detected (or installed). This value can be a
+  // blank string, if the version tag in the Update{} block (in Google Update's
+  // server config for Chrome) is blank.
   virtual void OnReportResults(GoogleUpdateUpgradeResult results,
                                GoogleUpdateErrorCode error_code,
-                               const std::wstring& version) = 0;
+                               const string16& error_message,
+                               const string16& version) = 0;
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // The Google Update class is responsible for communicating with Google Update
 // and get it to perform operations on our behalf (for example, CheckForUpdate).
 // This class will report back to its parent via the GoogleUpdateStatusListener
 // interface and will delete itself after reporting back.
 //
 ////////////////////////////////////////////////////////////////////////////////
@@ skipping 20 matching lines @@
   virtual ~GoogleUpdate();
 
 // The chromeos implementation is in browser/chromeos/google_update.cpp
 
 #if defined(OS_WIN)
 
   // This function reports failure from the Google Update operation to the
   // listener.
   // Note, after this function completes, this object will have deleted itself.
   bool ReportFailure(HRESULT hr, GoogleUpdateErrorCode error_code,
-                     MessageLoop* main_loop);
+                     const string16& error_message, MessageLoop* main_loop);
 
 #endif
 
   // We need to run the update check on another thread than the main thread, and
   // therefore CheckForUpdate will delegate to this function. |main_loop| points
   // to the message loop that we want the response to come from.
   // |window| should point to a foreground window. This is needed to ensure that
   // Vista/Windows 7 UAC prompts show up in the foreground. It may also be null.
   void InitiateGoogleUpdateCheck(bool install_if_newer, views::Widget* window,
                                  MessageLoop* main_loop);
 
   // This function reports the results of the GoogleUpdate operation to the
-  // listener. If results indicates an error, the error_code will indicate which
-  // error occurred.
+  // listener. If results indicates an error, the |error_code| and
+  // |error_message| will indicate which error occurred.
   // Note, after this function completes, this object will have deleted itself.
   void ReportResults(GoogleUpdateUpgradeResult results,
-                     GoogleUpdateErrorCode error_code);
+                     GoogleUpdateErrorCode error_code,
+                     const string16& error_message);
 
   // Which version string Google Update found (if a new one was available).
   // Otherwise, this will be blank.
-  std::wstring version_available_;
+  string16 version_available_;
 
   // The listener who is interested in finding out the result of the operation.
   GoogleUpdateStatusListener* listener_;
 
   DISALLOW_COPY_AND_ASSIGN(GoogleUpdate);
 };
 
 #endif  // CHROME_BROWSER_GOOGLE_GOOGLE_UPDATE_H_