Infobar Componentization Proof of Concept

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"
 #include "base/rand_util.h"
 #include "build/build_config.h"
 #include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/infobars/confirm_infobar_delegate.h"
+#include "chrome/browser/infobars/content_confirm_infobar_delegate.h"
 #include "chrome/browser/infobars/infobar.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/common/chrome_version_info.h"
 #include "content/public/browser/browser_child_process_host_iterator.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/child_process_data.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/plugin_service.h"
 #include "content/public/browser/render_process_host.h"
@@ skipping 96 matching lines @@
   }
   // Ignore the case where we didn't find the plugin, it may have terminated
   // before this function could run.
 }
 
 }  // namespace
 
 
 // HungPluginInfoBarDelegate --------------------------------------------------
 
-class HungPluginInfoBarDelegate : public ConfirmInfoBarDelegate {
+class HungPluginInfoBarDelegate : public ContentConfirmInfoBarDelegate {
  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 base::string16& plugin_name);
 
  private:
-  HungPluginInfoBarDelegate(HungPluginTabHelper* helper,
+  HungPluginInfoBarDelegate(content::WebContents* web_contents,
+                            HungPluginTabHelper* helper,
                             int plugin_child_id,
                             const base::string16& plugin_name);
   virtual ~HungPluginInfoBarDelegate();
 
   // ConfirmInfoBarDelegate:
   virtual int GetIconID() const OVERRIDE;
   virtual base::string16 GetMessageText() const OVERRIDE;
   virtual int GetButtons() const OVERRIDE;
   virtual base::string16 GetButtonLabel(InfoBarButton button) const OVERRIDE;
   virtual bool Accept() OVERRIDE;
 
   HungPluginTabHelper* helper_;
   int plugin_child_id_;
 
   base::string16 message_;
   base::string16 button_text_;
 };
 
 // static
 InfoBar* HungPluginInfoBarDelegate::Create(InfoBarService* infobar_service,
                                            HungPluginTabHelper* helper,
                                            int plugin_child_id,
                                            const base::string16& plugin_name) {
-  return infobar_service->AddInfoBar(ConfirmInfoBarDelegate::CreateInfoBar(
-      scoped_ptr<ConfirmInfoBarDelegate>(new HungPluginInfoBarDelegate(
-          helper, plugin_child_id, plugin_name))));
+  return infobar_service->AddInfoBar(
+      ConfirmInfoBarDelegate::CreateInfoBar(scoped_ptr<ConfirmInfoBarDelegate>(
+          new HungPluginInfoBarDelegate(infobar_service->web_contents(),
+                                        helper,
+                                        plugin_child_id,
+                                        plugin_name))));
 }
 
 HungPluginInfoBarDelegate::HungPluginInfoBarDelegate(
+    content::WebContents* web_contents,
     HungPluginTabHelper* helper,
     int plugin_child_id,
     const base::string16& plugin_name)
-    : ConfirmInfoBarDelegate(),
+    : ContentConfirmInfoBarDelegate(web_contents),
       helper_(helper),
       plugin_child_id_(plugin_child_id),
-      message_(l10n_util::GetStringFUTF16(
-          IDS_BROWSER_HANGMONITOR_PLUGIN_INFOBAR, plugin_name)),
+      message_(
+          l10n_util::GetStringFUTF16(IDS_BROWSER_HANGMONITOR_PLUGIN_INFOBAR,
+                                     plugin_name)),
       button_text_(l10n_util::GetStringUTF16(
-          IDS_BROWSER_HANGMONITOR_PLUGIN_INFOBAR_KILLBUTTON)) {
-}
+          IDS_BROWSER_HANGMONITOR_PLUGIN_INFOBAR_KILLBUTTON)) {}
 
 HungPluginInfoBarDelegate::~HungPluginInfoBarDelegate() {
 }
 
 int HungPluginInfoBarDelegate::GetIconID() const {
   return IDR_INFOBAR_PLUGIN_CRASHED;
 }
 
 base::string16 HungPluginInfoBarDelegate::GetMessageText() const {
   return message_;
@@ skipping 85 matching lines @@
       InfoBarService::FromWebContents(web_contents());
   if (!infobar_service)
     return;
 
   // For now, just do a brute-force search to see if we have this plugin. Since
   // we'll normally have 0 or 1, this is fast.
   for (PluginStateMap::iterator i = hung_plugins_.begin();
        i != hung_plugins_.end(); ++i) {
     if (i->second->path == plugin_path) {
       if (i->second->infobar)
-        infobar_service->RemoveInfoBar(i->second->infobar);
+        infobar_service->infobar_manager().RemoveInfoBar(i->second->infobar);
       hung_plugins_.erase(i);
       break;
     }
   }
 }
 
 void HungPluginTabHelper::PluginHungStatusChanged(
     int plugin_child_id,
     const base::FilePath& plugin_path,
     bool is_hung) {
   InfoBarService* infobar_service =
       InfoBarService::FromWebContents(web_contents());
   if (!infobar_service)
     return;
 
   PluginStateMap::iterator found = hung_plugins_.find(plugin_child_id);
   if (found != hung_plugins_.end()) {
     if (!is_hung) {
       // Hung plugin became un-hung, close the infobar and delete our info.
       if (found->second->infobar)
-        infobar_service->RemoveInfoBar(found->second->infobar);
+        infobar_service->infobar_manager().RemoveInfoBar(
+            found->second->infobar);
       hung_plugins_.erase(found);
     }
     return;
   }
 
   base::string16 plugin_name =
       content::PluginService::GetInstance()->GetPluginDisplayNameByPath(
           plugin_path);
 
   linked_ptr<PluginState> state(new PluginState(plugin_path, plugin_name));
@@ skipping 90 matching lines @@
 
   DCHECK(!state->infobar);
   state->infobar = HungPluginInfoBarDelegate::Create(infobar_service, this,
                                                      child_id, state->name);
 }
 
 void HungPluginTabHelper::CloseBar(PluginState* state) {
   InfoBarService* infobar_service =
       InfoBarService::FromWebContents(web_contents());
   if (infobar_service && state->infobar) {
-    infobar_service->RemoveInfoBar(state->infobar);
+    infobar_service->infobar_manager().RemoveInfoBar(state->infobar);
     state->infobar = NULL;
   }
 }