Index: chrome/browser/ui/hung_plugin_tab_helper.cc |
=================================================================== |
--- chrome/browser/ui/hung_plugin_tab_helper.cc (revision 175045) |
+++ chrome/browser/ui/hung_plugin_tab_helper.cc (working copy) |
@@ -122,13 +122,13 @@ |
} // 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; |
@@ -146,7 +146,7 @@ |
gfx::Image* icon_; |
}; |
-HungPluginTabHelper::InfoBarDelegate::InfoBarDelegate( |
+HungPluginInfoBarDelegate::HungPluginInfoBarDelegate( |
HungPluginTabHelper* helper, |
InfoBarService* infobar_service, |
int plugin_child_id, |
@@ -162,27 +162,26 @@ |
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; |
} |
@@ -274,7 +273,7 @@ |
// |
// 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(); |
@@ -363,8 +362,8 @@ |
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); |
} |