Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8476)

Unified Diff: chrome/browser/ui/hung_plugin_tab_helper.cc

Issue 15067008: [InfoBar] Add InfoBarDelegate::GetIconID() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Renaming back to GetIcon() Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/hung_plugin_tab_helper.cc
diff --git a/chrome/browser/ui/hung_plugin_tab_helper.cc b/chrome/browser/ui/hung_plugin_tab_helper.cc
index eafc07212472b6a95643a671deb84edd9d448294..9c74e58dd21bc47e540a5499a716314dd70dddc3 100644
--- a/chrome/browser/ui/hung_plugin_tab_helper.cc
+++ b/chrome/browser/ui/hung_plugin_tab_helper.cc
@@ -148,7 +148,7 @@ class HungPluginInfoBarDelegate : public ConfirmInfoBarDelegate {
virtual ~HungPluginInfoBarDelegate();
// ConfirmInfoBarDelegate:
- virtual gfx::Image* GetIcon() const OVERRIDE;
+ virtual int GetIconID() const OVERRIDE;
virtual string16 GetMessageText() const OVERRIDE;
virtual int GetButtons() const OVERRIDE;
virtual string16 GetButtonLabel(InfoBarButton button) const OVERRIDE;
@@ -159,7 +159,6 @@ class HungPluginInfoBarDelegate : public ConfirmInfoBarDelegate {
string16 message_;
string16 button_text_;
- gfx::Image* icon_;
};
// static
@@ -185,15 +184,13 @@ HungPluginInfoBarDelegate::HungPluginInfoBarDelegate(
plugin_name);
button_text_ = l10n_util::GetStringUTF16(
IDS_BROWSER_HANGMONITOR_PLUGIN_INFOBAR_KILLBUTTON);
- icon_ = &ResourceBundle::GetSharedInstance().GetNativeImageNamed(
- IDR_INFOBAR_PLUGIN_CRASHED);
}
HungPluginInfoBarDelegate::~HungPluginInfoBarDelegate() {
}
-gfx::Image* HungPluginInfoBarDelegate::GetIcon() const {
- return icon_;
+int HungPluginInfoBarDelegate::GetIconID() const {
+ return IDR_INFOBAR_PLUGIN_CRASHED;
}
string16 HungPluginInfoBarDelegate::GetMessageText() const {

Powered by Google App Engine
This is Rietveld 408576698