Revert 238283 "Infobar system refactor."

trunk/src/chrome/browser/ui/hung_plugin_tab_helper.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/hung_plugin_tab_helper.h"
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/process/process.h"
@@ skipping 112 matching lines @@
   // before this function could run.
 }
 
 }  // namespace
 
 
 // HungPluginInfoBarDelegate --------------------------------------------------
 
 class HungPluginInfoBarDelegate : public ConfirmInfoBarDelegate {
  public:
-  // Creates a hung plugin infobar and delegate and adds the infobar to
-  // |infobar_service|.  Returns the infobar if it was successfully added.
-  static InfoBar* Create(InfoBarService* infobar_service,
-                         HungPluginTabHelper* helper,
-                         int plugin_child_id,
-                         const string16& plugin_name);
+  // Creates a hung plugin infobar delegate and adds it to |infobar_service|.
+  // Returns the delegate if it was successfully added.
+  static HungPluginInfoBarDelegate* Create(InfoBarService* infobar_service,
+                                           HungPluginTabHelper* helper,
+                                           int plugin_child_id,
+                                           const string16& plugin_name);
 
  private:
   HungPluginInfoBarDelegate(HungPluginTabHelper* helper,
+                            InfoBarService* infobar_service,
                             int plugin_child_id,
                             const string16& plugin_name);
   virtual ~HungPluginInfoBarDelegate();
 
   // ConfirmInfoBarDelegate:
   virtual int GetIconID() const OVERRIDE;
   virtual string16 GetMessageText() const OVERRIDE;
   virtual int GetButtons() const OVERRIDE;
   virtual string16 GetButtonLabel(InfoBarButton button) const OVERRIDE;
   virtual bool Accept() OVERRIDE;
 
   HungPluginTabHelper* helper_;
   int plugin_child_id_;
 
   string16 message_;
   string16 button_text_;
 };
 
 // static
-InfoBar* HungPluginInfoBarDelegate::Create(InfoBarService* infobar_service,
-                                           HungPluginTabHelper* helper,
-                                           int plugin_child_id,
-                                           const string16& plugin_name) {
-  return infobar_service->AddInfoBar(ConfirmInfoBarDelegate::CreateInfoBar(
-      scoped_ptr<ConfirmInfoBarDelegate>(new HungPluginInfoBarDelegate(
-          helper, plugin_child_id, plugin_name))));
+HungPluginInfoBarDelegate* HungPluginInfoBarDelegate::Create(
+    InfoBarService* infobar_service,
+    HungPluginTabHelper* helper,
+    int plugin_child_id,
+    const string16& plugin_name) {
+  return static_cast<HungPluginInfoBarDelegate*>(infobar_service->AddInfoBar(
+      scoped_ptr<InfoBarDelegate>(new HungPluginInfoBarDelegate(
+          helper, infobar_service, plugin_child_id, plugin_name))));
 }
 
 HungPluginInfoBarDelegate::HungPluginInfoBarDelegate(
     HungPluginTabHelper* helper,
+    InfoBarService* infobar_service,
     int plugin_child_id,
     const string16& plugin_name)
-    : ConfirmInfoBarDelegate(),
+    : ConfirmInfoBarDelegate(infobar_service),
       helper_(helper),
       plugin_child_id_(plugin_child_id),
       message_(l10n_util::GetStringFUTF16(
           IDS_BROWSER_HANGMONITOR_PLUGIN_INFOBAR, plugin_name)),
       button_text_(l10n_util::GetStringUTF16(
           IDS_BROWSER_HANGMONITOR_PLUGIN_INFOBAR_KILLBUTTON)) {
 }
 
 HungPluginInfoBarDelegate::~HungPluginInfoBarDelegate() {
 }
@@ skipping 28 matching lines @@
 // not we're currently showing the infobar.
 struct HungPluginTabHelper::PluginState {
   // Initializes the plugin state to be a hung plugin.
   PluginState(const base::FilePath& p, const string16& n);
   ~PluginState();
 
   base::FilePath path;
   string16 name;
 
   // Possibly-null if we're not showing an infobar right now.
-  InfoBar* infobar;
+  InfoBarDelegate* infobar;
 
   // Time to delay before re-showing the infobar for a hung plugin. This is
   // increased each time the user cancels it.
   base::TimeDelta next_reshow_delay;
 
   // Handles calling the helper when the infobar should be re-shown.
   base::Timer timer;
 
  private:
   // Initial delay in seconds before re-showing the hung plugin message.
@@ skipping 83 matching lines @@
   linked_ptr<PluginState> state(new PluginState(plugin_path, plugin_name));
   hung_plugins_[plugin_child_id] = state;
   ShowBar(plugin_child_id, state.get());
 }
 
 void HungPluginTabHelper::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   DCHECK_EQ(chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_REMOVED, type);
-  InfoBar* infobar = content::Details<InfoBar::RemovedDetails>(details)->first;
+  // Note: do not dereference. The InfoBarContainer will delete the object when
+  // it gets this notification, we only remove our tracking info, if we have
+  // any.
+  //
+  // TODO(pkasting): This comment will be incorrect and should be removed once
+  // InfoBars own their delegates.
+  InfoBarDelegate* infobar =
+      content::Details<InfoBar::RemovedDetails>(details)->first;
   for (PluginStateMap::iterator i = hung_plugins_.begin();
        i != hung_plugins_.end(); ++i) {
     PluginState* state = i->second.get();
     if (state->infobar == infobar) {
       state->infobar = NULL;
 
       // Schedule the timer to re-show the infobar if the plugin continues to be
       // hung.
       state->timer.Start(FROM_HERE, state->next_reshow_delay,
           base::Bind(&HungPluginTabHelper::OnReshowTimer,
@@ skipping 74 matching lines @@
 }
 
 void HungPluginTabHelper::CloseBar(PluginState* state) {
   InfoBarService* infobar_service =
       InfoBarService::FromWebContents(web_contents());
   if (infobar_service && state->infobar) {
     infobar_service->RemoveInfoBar(state->infobar);
     state->infobar = NULL;
   }
 }