Revert 238283 "Infobar system refactor."

trunk/src/chrome/browser/ui/extensions/extension_install_ui_default.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/ui/extensions/extension_install_ui_default.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/extension_install_prompt.h"
 #include "chrome/browser/extensions/theme_installed_infobar_delegate.h"
 #include "chrome/browser/infobars/confirm_infobar_delegate.h"
-#include "chrome/browser/infobars/infobar.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/app_list/app_list_service.h"
 #include "chrome/browser/ui/app_list/app_list_util.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_dialogs.h"
@@ skipping 49 matching lines @@
   if (browser)
     chrome::ShowExtensionInstalledBubble(extension, browser, icon);
 }
 
 
 // ErrorInfoBarDelegate -------------------------------------------------------
 
 // Helper class to put up an infobar when installation fails.
 class ErrorInfoBarDelegate : public ConfirmInfoBarDelegate {
  public:
-  // Creates an error infobar and delegate and adds the infobar to
-  // |infobar_service|.
+  // Creates an error infobar delegate and adds it to |infobar_service|.
   static void Create(InfoBarService* infobar_service,
                      const extensions::CrxInstallerError& error);
 
  private:
-  explicit ErrorInfoBarDelegate(const extensions::CrxInstallerError& error);
+  ErrorInfoBarDelegate(InfoBarService* infobar_service,
+                       const extensions::CrxInstallerError& error);
   virtual ~ErrorInfoBarDelegate();
 
   // ConfirmInfoBarDelegate:
   virtual string16 GetMessageText() const OVERRIDE;
   virtual int GetButtons() const OVERRIDE;
   virtual string16 GetLinkText() const OVERRIDE;
   virtual bool LinkClicked(WindowOpenDisposition disposition) OVERRIDE;
 
   extensions::CrxInstallerError error_;
 
   DISALLOW_COPY_AND_ASSIGN(ErrorInfoBarDelegate);
 };
 
 // static
 void ErrorInfoBarDelegate::Create(InfoBarService* infobar_service,
                                   const extensions::CrxInstallerError& error) {
-  infobar_service->AddInfoBar(ConfirmInfoBarDelegate::CreateInfoBar(
-      scoped_ptr<ConfirmInfoBarDelegate>(new ErrorInfoBarDelegate(error))));
+  infobar_service->AddInfoBar(scoped_ptr<InfoBarDelegate>(
+      new ErrorInfoBarDelegate(infobar_service, error)));
 }
 
 ErrorInfoBarDelegate::ErrorInfoBarDelegate(
+    InfoBarService* infobar_service,
     const extensions::CrxInstallerError& error)
-    : ConfirmInfoBarDelegate(),
+    : ConfirmInfoBarDelegate(infobar_service),
       error_(error) {
 }
 
 ErrorInfoBarDelegate::~ErrorInfoBarDelegate() {
 }
 
 string16 ErrorInfoBarDelegate::GetMessageText() const {
   return error_.message();
 }
 
@@ skipping 160 matching lines @@
       browser->tab_strip_model()->GetActiveWebContents();
   if (!web_contents)
     return;
   ErrorInfoBarDelegate::Create(InfoBarService::FromWebContents(web_contents),
                                error);
 }
 
 void ExtensionInstallUIDefault::SetUseAppInstalledBubble(bool use_bubble) {
   use_app_installed_bubble_ = use_bubble;
 }