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

chrome/browser/extensions/extension_install_prompt.cc

 // 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.
 
 #include "chrome/browser/extensions/extension_install_prompt.h"
 
 #include <map>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
@@ skipping 330 matching lines @@
 }
 
 void ExtensionInstallPrompt::OnInstallSuccess(const Extension* extension,
                                               SkBitmap* icon) {
   extension_ = extension;
   SetIcon(icon);
 
   install_ui_->OnInstallSuccess(extension, &icon_);
 }
 
-void ExtensionInstallPrompt::OnInstallFailure(const string16& error) {
+void ExtensionInstallPrompt::OnInstallFailure(const CrxInstallerError& error) {
   install_ui_->OnInstallFailure(error);
 }
 
 void ExtensionInstallPrompt::SetIcon(const SkBitmap* image) {
   if (image)
     icon_ = *image;
   else
     icon_ = SkBitmap();
   if (icon_.empty())
     icon_ = Extension::GetDefaultIcon(extension_->is_app());
@@ skipping 39 matching lines @@
     case BUNDLE_INSTALL_PROMPT: {
       prompt_.set_bundle(bundle_);
       ShowExtensionInstallDialog(browser_, delegate_, prompt_);
       break;
     }
     default:
       NOTREACHED() << "Unknown message";
       break;
   }
 }