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

Unified Diff: chrome/browser/ssl/ssl_add_certificate.cc

Issue 1364913005: Update some more infobars to use vector icons. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix mac Created 5 years, 3 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/ui/chrome_select_file_policy.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ssl/ssl_add_certificate.cc
diff --git a/chrome/browser/ssl/ssl_add_certificate.cc b/chrome/browser/ssl/ssl_add_certificate.cc
index 89cbe5ff8fc065882be1a0b0ba99cdcd0e4e3e04..7b8d51eae950b5fe700f6668f44d818d0cb9d287 100644
--- a/chrome/browser/ssl/ssl_add_certificate.cc
+++ b/chrome/browser/ssl/ssl_add_certificate.cc
@@ -21,6 +21,7 @@
#include "net/cert/cert_database.h"
#include "net/cert/x509_certificate.h"
#include "ui/base/l10n/l10n_util.h"
+#include "ui/gfx/vector_icons_public.h"
using content::BrowserThread;
using content::RenderFrameHost;
@@ -44,6 +45,7 @@ class SSLAddCertificateInfoBarDelegate : public ConfirmInfoBarDelegate {
// ConfirmInfoBarDelegate:
Type GetInfoBarType() const override;
int GetIconId() const override;
+ gfx::VectorIconId GetVectorIconId() const override;
base::string16 GetMessageText() const override;
int GetButtons() const override;
base::string16 GetButtonLabel(InfoBarButton button) const override;
@@ -81,6 +83,14 @@ int SSLAddCertificateInfoBarDelegate::GetIconId() const {
return IDR_INFOBAR_SAVE_PASSWORD;
}
+gfx::VectorIconId SSLAddCertificateInfoBarDelegate::GetVectorIconId() const {
+#if !defined(OS_MACOSX)
+ return gfx::VectorIconId::AUTOLOGIN;
+#else
+ return gfx::VectorIconId::VECTOR_ICON_NONE;
+#endif
+}
+
base::string16 SSLAddCertificateInfoBarDelegate::GetMessageText() const {
// TODO(evanm): GetDisplayName should return UTF-16.
return l10n_util::GetStringFUTF16(IDS_ADD_CERT_SUCCESS_INFOBAR_LABEL,
@@ -120,12 +130,15 @@ void ShowErrorInfoBar(int message_id,
// TODO(davidben): Use a more appropriate icon.
// TODO(davidben): Display a more user-friendly error string.
SimpleAlertInfoBarDelegate::Create(
- InfoBarService::FromWebContents(web_contents),
- IDR_INFOBAR_SAVE_PASSWORD,
- l10n_util::GetStringFUTF16(IDS_ADD_CERT_ERR_INVALID_CERT,
- base::IntToString16(-cert_error),
- base::ASCIIToUTF16(
- net::ErrorToString(cert_error))),
+ InfoBarService::FromWebContents(web_contents), IDR_INFOBAR_SAVE_PASSWORD,
+#if !defined(OS_MACOSX)
+ gfx::VectorIconId::AUTOLOGIN,
+#else
+ gfx::VectorIconId::VECTOR_ICON_NONE,
+#endif
+ l10n_util::GetStringFUTF16(
+ IDS_ADD_CERT_ERR_INVALID_CERT, base::IntToString16(-cert_error),
+ base::ASCIIToUTF16(net::ErrorToString(cert_error))),
true);
}
« no previous file with comments | « chrome/browser/plugins/plugin_observer.cc ('k') | chrome/browser/ui/chrome_select_file_policy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698