Revert 238283 "Infobar system refactor."

trunk/src/chrome/browser/devtools/devtools_window.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/devtools/devtools_window.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/lazy_instance.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/api/debugger/debugger_api.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/extension_web_contents_observer.h"
 #include "chrome/browser/file_select_helper.h"
 #include "chrome/browser/infobars/confirm_infobar_delegate.h"
-#include "chrome/browser/infobars/infobar.h"
 #include "chrome/browser/prefs/pref_service_syncable.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/session_tab_helper.h"
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/browser/ui/browser_iterator.h"
 #include "chrome/browser/ui/browser_list.h"
@@ skipping 42 matching lines @@
  public:
   // If |infobar_service| is NULL, runs |callback| with a single argument with
   // value "false".  Otherwise, creates a dev tools confirm infobar and delegate
   // and adds the inofbar to |infobar_service|.
   static void Create(InfoBarService* infobar_service,
                      const DevToolsWindow::InfoBarCallback& callback,
                      const string16& message);
 
  private:
   DevToolsConfirmInfoBarDelegate(
+      InfoBarService* infobar_service,
       const DevToolsWindow::InfoBarCallback& callback,
       const string16& message);
   virtual ~DevToolsConfirmInfoBarDelegate();
 
   virtual string16 GetMessageText() const OVERRIDE;
   virtual string16 GetButtonLabel(InfoBarButton button) const OVERRIDE;
   virtual bool Accept() OVERRIDE;
   virtual bool Cancel() OVERRIDE;
 
   DevToolsWindow::InfoBarCallback callback_;
   const string16 message_;
 
   DISALLOW_COPY_AND_ASSIGN(DevToolsConfirmInfoBarDelegate);
 };
 
 void DevToolsConfirmInfoBarDelegate::Create(
     InfoBarService* infobar_service,
     const DevToolsWindow::InfoBarCallback& callback,
     const string16& message) {
   if (!infobar_service) {
     callback.Run(false);
     return;
   }
 
-  infobar_service->AddInfoBar(ConfirmInfoBarDelegate::CreateInfoBar(
-      scoped_ptr<ConfirmInfoBarDelegate>(
-          new DevToolsConfirmInfoBarDelegate(callback, message))));
+  infobar_service->AddInfoBar(scoped_ptr<InfoBarDelegate>(
+      new DevToolsConfirmInfoBarDelegate(infobar_service, callback, message)));
 }
 
 DevToolsConfirmInfoBarDelegate::DevToolsConfirmInfoBarDelegate(
+    InfoBarService* infobar_service,
     const DevToolsWindow::InfoBarCallback& callback,
     const string16& message)
-    : ConfirmInfoBarDelegate(),
+    : ConfirmInfoBarDelegate(infobar_service),
       callback_(callback),
       message_(message) {
 }
 
 DevToolsConfirmInfoBarDelegate::~DevToolsConfirmInfoBarDelegate() {
   if (!callback_.is_null())
     callback_.Run(false);
 }
 
 string16 DevToolsConfirmInfoBarDelegate::GetMessageText() const {
@@ skipping 1381 matching lines @@
   return inspected_contents_observer_ ?
       inspected_contents_observer_->web_contents() : NULL;
 }
 
 void DevToolsWindow::DocumentOnLoadCompletedInMainFrame() {
   is_loaded_ = true;
   UpdateTheme();
   DoAction();
   AddDevToolsExtensionsToClient();
 }