Rename HungPluginTabHelper::InfoBarDelegate to HungPluginInfoBarDelegate for consistency with other…

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/memory/scoped_ptr.h"
 #include "base/process.h"
 #include "base/process_util.h"
@@ skipping 104 matching lines @@
       break;
     }
     ++iter;
   }
   // Ignore the case where we didn't find the plugin, it may have terminated
   // before this function could run.
 }
 
 }  // namespace
 
-class HungPluginTabHelper::InfoBarDelegate : public ConfirmInfoBarDelegate {
+class HungPluginInfoBarDelegate : public ConfirmInfoBarDelegate {
  public:
-  InfoBarDelegate(HungPluginTabHelper* helper,
-                  InfoBarService* infobar_service,
-                  int plugin_child_id,
-                  const string16& plugin_name);
-  virtual ~InfoBarDelegate();
+  HungPluginInfoBarDelegate(HungPluginTabHelper* helper,
+                            InfoBarService* infobar_service,
+                            int plugin_child_id,
+                            const string16& plugin_name);
+  virtual ~HungPluginInfoBarDelegate();
 
   // ConfirmInfoBarDelegate:
   virtual gfx::Image* GetIcon() const OVERRIDE;
   virtual string16 GetMessageText() const OVERRIDE;
   virtual int GetButtons() const OVERRIDE;
   virtual string16 GetButtonLabel(InfoBarButton button) const OVERRIDE;
   virtual bool Accept() OVERRIDE;
 
  private:
   HungPluginTabHelper* helper_;
   int plugin_child_id_;
 
   string16 message_;
   string16 button_text_;
   gfx::Image* icon_;
 };
 
-HungPluginTabHelper::InfoBarDelegate::InfoBarDelegate(
+HungPluginInfoBarDelegate::HungPluginInfoBarDelegate(
     HungPluginTabHelper* helper,
     InfoBarService* infobar_service,
     int plugin_child_id,
     const string16& plugin_name)
     : 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);
   icon_ = &ResourceBundle::GetSharedInstance().GetNativeImageNamed(
       IDR_INFOBAR_PLUGIN_CRASHED);
 }
 
-HungPluginTabHelper::InfoBarDelegate::~InfoBarDelegate() {
+HungPluginInfoBarDelegate::~HungPluginInfoBarDelegate() {
 }
 
-gfx::Image* HungPluginTabHelper::InfoBarDelegate::GetIcon() const {
+gfx::Image* HungPluginInfoBarDelegate::GetIcon() const {
   return icon_;
 }
 
-string16 HungPluginTabHelper::InfoBarDelegate::GetMessageText() const {
+string16 HungPluginInfoBarDelegate::GetMessageText() const {
   return message_;
 }
 
-int HungPluginTabHelper::InfoBarDelegate::GetButtons() const {
+int HungPluginInfoBarDelegate::GetButtons() const {
   return BUTTON_OK;
 }
 
-string16 HungPluginTabHelper::InfoBarDelegate::GetButtonLabel(
-    InfoBarButton button) const {
+string16 HungPluginInfoBarDelegate::GetButtonLabel(InfoBarButton button) const {
   return button_text_;
 }
 
-bool HungPluginTabHelper::InfoBarDelegate::Accept() {
+bool HungPluginInfoBarDelegate::Accept() {
   helper_->KillPlugin(plugin_child_id_);
   return true;
 }
 
 // -----------------------------------------------------------------------------
 
 HungPluginTabHelper::PluginState::PluginState(const FilePath& p,
                                               const string16& n)
     : path(p),
       name(n),
@@ skipping 71 matching lines @@
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   DCHECK_EQ(chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_REMOVED, type);
 
   // 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* delegate =
+  InfoBarDelegate* delegate =
       content::Details<InfoBarRemovedDetails>(details)->first;
 
   for (PluginStateMap::iterator i = hung_plugins_.begin();
        i != hung_plugins_.end(); ++i) {
     PluginState* state = i->second.get();
     if (state->info_bar == delegate) {
       state->info_bar = NULL;
 
       // Schedule the timer to re-show the infobar if the plugin continues to be
       // hung.
@@ skipping 68 matching lines @@
   ShowBar(child_id, found->second.get());
 }
 
 void HungPluginTabHelper::ShowBar(int child_id, PluginState* state) {
   InfoBarService* infobar_service =
       InfoBarService::FromWebContents(web_contents());
   if (!infobar_service)
     return;
 
   DCHECK(!state->info_bar);
-  state->info_bar = new InfoBarDelegate(this, infobar_service,
-                                        child_id, state->name);
+  state->info_bar = new HungPluginInfoBarDelegate(this, infobar_service,
+                                                  child_id, state->name);
   infobar_service->AddInfoBar(state->info_bar);
 }
 
 void HungPluginTabHelper::CloseBar(PluginState* state) {
   InfoBarService* infobar_service =
       InfoBarService::FromWebContents(web_contents());
   if (!infobar_service)
     return;
 
   if (state->info_bar) {
     infobar_service->RemoveInfoBar(state->info_bar);
     state->info_bar = NULL;
   }
 }