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

Unified Diff: chrome/browser/password_manager/password_manager_delegate_impl.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
« no previous file with comments | « chrome/browser/omnibox_search_hint.cc ('k') | chrome/browser/pepper_broker_infobar_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/password_manager/password_manager_delegate_impl.cc
diff --git a/chrome/browser/password_manager/password_manager_delegate_impl.cc b/chrome/browser/password_manager/password_manager_delegate_impl.cc
index 1b74b3747a924e8c6ca7a80f1c38ff7ea49a16a9..132d72461bc0147ba946bab327b6efc49d088400 100644
--- a/chrome/browser/password_manager/password_manager_delegate_impl.cc
+++ b/chrome/browser/password_manager/password_manager_delegate_impl.cc
@@ -26,7 +26,6 @@
#include "grit/theme_resources.h"
#include "net/cert/cert_status_flags.h"
#include "ui/base/l10n/l10n_util.h"
-#include "ui/base/resource/resource_bundle.h"
// SavePasswordInfoBarDelegate ------------------------------------------------
@@ -57,7 +56,7 @@ class SavePasswordInfoBarDelegate : public ConfirmInfoBarDelegate {
virtual ~SavePasswordInfoBarDelegate();
// ConfirmInfoBarDelegate
- virtual gfx::Image* GetIcon() const OVERRIDE;
+ virtual int GetIconID() const OVERRIDE;
virtual Type GetInfoBarType() const OVERRIDE;
virtual string16 GetMessageText() const OVERRIDE;
virtual string16 GetButtonLabel(InfoBarButton button) const OVERRIDE;
@@ -115,9 +114,8 @@ SavePasswordInfoBarDelegate::~SavePasswordInfoBarDelegate() {
infobar_response_, NUM_RESPONSE_TYPES);
}
-gfx::Image* SavePasswordInfoBarDelegate::GetIcon() const {
- return &ResourceBundle::GetSharedInstance().GetNativeImageNamed(
- IDR_INFOBAR_SAVE_PASSWORD);
+int SavePasswordInfoBarDelegate::GetIconID() const {
+ return IDR_INFOBAR_SAVE_PASSWORD;
}
InfoBarDelegate::Type SavePasswordInfoBarDelegate::GetInfoBarType() const {
« no previous file with comments | « chrome/browser/omnibox_search_hint.cc ('k') | chrome/browser/pepper_broker_infobar_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698