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

Unified Diff: chrome/browser/ssl/ssl_tab_helper.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/plugins/plugin_observer.cc ('k') | chrome/browser/translate/translate_infobar_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ssl/ssl_tab_helper.cc
diff --git a/chrome/browser/ssl/ssl_tab_helper.cc b/chrome/browser/ssl/ssl_tab_helper.cc
index 55f985530527d9285be2c3e5b05a3dcb00ead4d8..1bb83d47187e84e48f7d3ecc0a9da1b3d8cd104c 100644
--- a/chrome/browser/ssl/ssl_tab_helper.cc
+++ b/chrome/browser/ssl/ssl_tab_helper.cc
@@ -34,7 +34,6 @@
#include "net/base/net_errors.h"
#include "net/cert/x509_certificate.h"
#include "ui/base/l10n/l10n_util.h"
-#include "ui/base/resource/resource_bundle.h"
// SSLCertResultInfoBarDelegate -----------------------------------------------
@@ -59,7 +58,7 @@ class SSLCertResultInfoBarDelegate : public ConfirmInfoBarDelegate {
virtual ~SSLCertResultInfoBarDelegate();
// ConfirmInfoBarDelegate:
- 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;
@@ -97,10 +96,9 @@ SSLCertResultInfoBarDelegate::SSLCertResultInfoBarDelegate(
SSLCertResultInfoBarDelegate::~SSLCertResultInfoBarDelegate() {
}
-gfx::Image* SSLCertResultInfoBarDelegate::GetIcon() const {
+int SSLCertResultInfoBarDelegate::GetIconID() const {
// TODO(davidben): use a more appropriate icon.
- return &ResourceBundle::GetSharedInstance().GetNativeImageNamed(
- IDR_INFOBAR_SAVE_PASSWORD);
+ return IDR_INFOBAR_SAVE_PASSWORD;
}
InfoBarDelegate::Type SSLCertResultInfoBarDelegate::GetInfoBarType() const {
« no previous file with comments | « chrome/browser/plugins/plugin_observer.cc ('k') | chrome/browser/translate/translate_infobar_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698