Merge 142921 - Use an infobar instead of alert box for extension install

chrome/browser/extensions/extension_install_prompt.h

 // Copyright (c) 2012 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_EXTENSIONS_EXTENSION_INSTALL_PROMPT_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_INSTALL_PROMPT_H_
 #pragma once
 
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
+#include "chrome/browser/extensions/crx_installer_error.h"
 #include "chrome/browser/extensions/image_loading_tracker.h"
 #include "chrome/common/extensions/url_pattern.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/native_widget_types.h"
 
 class Browser;
 class ExtensionInstallUI;
 class ExtensionPermissionSet;
@@ skipping 173 matching lines @@
   // We *MUST* eventually call either Proceed() or Abort() on |delegate|.
   virtual void ConfirmPermissions(Delegate* delegate,
                                   const extensions::Extension* extension,
                                   const ExtensionPermissionSet* permissions);
 
   // Installation was successful. This is declared virtual for testing.
   virtual void OnInstallSuccess(const extensions::Extension* extension,
                                 SkBitmap* icon);
 
   // Installation failed. This is declared virtual for testing.
-  virtual void OnInstallFailure(const string16& error);
+  virtual void OnInstallFailure(const CrxInstallerError& error);
 
   // ImageLoadingTracker::Observer:
   virtual void OnImageLoaded(const gfx::Image& image,
                              const std::string& extension_id,
                              int index) OVERRIDE;
 
  protected:
   friend class extensions::ExtensionWebstorePrivateApiTest;
   friend class WebstoreInlineInstallUnpackFailureTest;
 
@@ skipping 38 matching lines @@
 
   // The type of prompt we are going to show.
   PromptType prompt_type_;
 
   // Keeps track of extension images being loaded on the File thread for the
   // purpose of showing the install UI.
   ImageLoadingTracker tracker_;
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_INSTALL_PROMPT_H_