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

Unified Diff: chrome/browser/omnibox_search_hint.cc

Issue 15067008: [InfoBar] Add InfoBarDelegate::GetIconID() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Nit fixes redux 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/omnibox_search_hint.cc
diff --git a/chrome/browser/omnibox_search_hint.cc b/chrome/browser/omnibox_search_hint.cc
index ec57075f2ebca6a6722cdc8f7e6fc44625a7231b..a4c93e24c0ec3cce4a9e1a54c6cb5ea905ac2172 100644
--- a/chrome/browser/omnibox_search_hint.cc
+++ b/chrome/browser/omnibox_search_hint.cc
@@ -36,7 +36,6 @@
#include "grit/generated_resources.h"
#include "grit/theme_resources.h"
#include "ui/base/l10n/l10n_util.h"
-#include "ui/base/resource/resource_bundle.h"
using content::NavigationController;
using content::NavigationEntry;
@@ -62,7 +61,7 @@ class HintInfoBarDelegate : public ConfirmInfoBarDelegate {
// ConfirmInfoBarDelegate:
virtual void InfoBarDismissed() OVERRIDE;
- virtual gfx::Image* GetIcon() const OVERRIDE;
+ virtual int GetIconID() const OVERRIDE;
virtual Type GetInfoBarType() const OVERRIDE;
virtual string16 GetMessageText() const OVERRIDE;
virtual int GetButtons() const OVERRIDE;
@@ -155,9 +154,8 @@ void HintInfoBarDelegate::InfoBarDismissed() {
omnibox_hint_->DisableHint();
}
-gfx::Image* HintInfoBarDelegate::GetIcon() const {
- return &ResourceBundle::GetSharedInstance().GetNativeImageNamed(
- IDR_INFOBAR_QUESTION_MARK);
+int HintInfoBarDelegate::GetIconID() const {
+ return IDR_INFOBAR_QUESTION_MARK;
}
InfoBarDelegate::Type HintInfoBarDelegate::GetInfoBarType() const {

Powered by Google App Engine
This is Rietveld 408576698