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

Side by Side Diff: chrome/browser/ssl/ssl_add_certificate.cc

Issue 1520543004: Add method for identifying different InfoBars (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Nit again Created 4 years, 11 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ssl/ssl_add_certificate.h" 5 #include "chrome/browser/ssl/ssl_add_certificate.h"
6 6
7 #include "base/macros.h" 7 #include "base/macros.h"
8 #include "base/strings/string_number_conversions.h" 8 #include "base/strings/string_number_conversions.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "build/build_config.h" 10 #include "build/build_config.h"
11 #include "chrome/browser/certificate_viewer.h" 11 #include "chrome/browser/certificate_viewer.h"
12 #include "chrome/browser/infobars/infobar_service.h" 12 #include "chrome/browser/infobars/infobar_service.h"
13 #include "chrome/grit/generated_resources.h" 13 #include "chrome/grit/generated_resources.h"
14 #include "components/infobars/core/confirm_infobar_delegate.h" 14 #include "components/infobars/core/confirm_infobar_delegate.h"
15 #include "components/infobars/core/infobar.h" 15 #include "components/infobars/core/infobar.h"
16 #include "components/infobars/core/infobar_delegate.h"
16 #include "components/infobars/core/simple_alert_infobar_delegate.h" 17 #include "components/infobars/core/simple_alert_infobar_delegate.h"
17 #include "content/public/browser/browser_thread.h" 18 #include "content/public/browser/browser_thread.h"
18 #include "content/public/browser/render_frame_host.h" 19 #include "content/public/browser/render_frame_host.h"
19 #include "content/public/browser/web_contents.h" 20 #include "content/public/browser/web_contents.h"
20 #include "grit/theme_resources.h" 21 #include "grit/theme_resources.h"
21 #include "net/base/net_errors.h" 22 #include "net/base/net_errors.h"
22 #include "net/cert/cert_database.h" 23 #include "net/cert/cert_database.h"
23 #include "net/cert/x509_certificate.h" 24 #include "net/cert/x509_certificate.h"
24 #include "ui/base/l10n/l10n_util.h" 25 #include "ui/base/l10n/l10n_util.h"
25 #include "ui/gfx/vector_icons_public.h" 26 #include "ui/gfx/vector_icons_public.h"
(...skipping 12 matching lines...) Expand all
38 // the infobar to |infobar_service|. 39 // the infobar to |infobar_service|.
39 static void Create(InfoBarService* infobar_service, 40 static void Create(InfoBarService* infobar_service,
40 net::X509Certificate* cert); 41 net::X509Certificate* cert);
41 42
42 private: 43 private:
43 explicit SSLAddCertificateInfoBarDelegate(net::X509Certificate* cert); 44 explicit SSLAddCertificateInfoBarDelegate(net::X509Certificate* cert);
44 ~SSLAddCertificateInfoBarDelegate() override; 45 ~SSLAddCertificateInfoBarDelegate() override;
45 46
46 // ConfirmInfoBarDelegate: 47 // ConfirmInfoBarDelegate:
47 Type GetInfoBarType() const override; 48 Type GetInfoBarType() const override;
49 infobars::InfoBarDelegate::InfoBarIdentifier GetIdentifier() const override;
48 int GetIconId() const override; 50 int GetIconId() const override;
49 gfx::VectorIconId GetVectorIconId() const override; 51 gfx::VectorIconId GetVectorIconId() const override;
50 base::string16 GetMessageText() const override; 52 base::string16 GetMessageText() const override;
51 int GetButtons() const override; 53 int GetButtons() const override;
52 base::string16 GetButtonLabel(InfoBarButton button) const override; 54 base::string16 GetButtonLabel(InfoBarButton button) const override;
53 bool Accept() override; 55 bool Accept() override;
54 56
55 // The certificate that was added. 57 // The certificate that was added.
56 scoped_refptr<net::X509Certificate> cert_; 58 scoped_refptr<net::X509Certificate> cert_;
57 59
(...skipping 14 matching lines...) Expand all
72 } 74 }
73 75
74 SSLAddCertificateInfoBarDelegate::~SSLAddCertificateInfoBarDelegate() { 76 SSLAddCertificateInfoBarDelegate::~SSLAddCertificateInfoBarDelegate() {
75 } 77 }
76 78
77 infobars::InfoBarDelegate::Type 79 infobars::InfoBarDelegate::Type
78 SSLAddCertificateInfoBarDelegate::GetInfoBarType() const { 80 SSLAddCertificateInfoBarDelegate::GetInfoBarType() const {
79 return PAGE_ACTION_TYPE; 81 return PAGE_ACTION_TYPE;
80 } 82 }
81 83
84 infobars::InfoBarDelegate::InfoBarIdentifier
85 SSLAddCertificateInfoBarDelegate::GetIdentifier() const {
86 return SSL_ADD_CERTIFICATE_INFOBAR_DELEGATE;
87 }
88
82 int SSLAddCertificateInfoBarDelegate::GetIconId() const { 89 int SSLAddCertificateInfoBarDelegate::GetIconId() const {
83 // TODO(davidben): Use a more appropriate icon. 90 // TODO(davidben): Use a more appropriate icon.
84 return IDR_INFOBAR_SAVE_PASSWORD; 91 return IDR_INFOBAR_SAVE_PASSWORD;
85 } 92 }
86 93
87 gfx::VectorIconId SSLAddCertificateInfoBarDelegate::GetVectorIconId() const { 94 gfx::VectorIconId SSLAddCertificateInfoBarDelegate::GetVectorIconId() const {
88 #if !defined(OS_MACOSX) 95 #if !defined(OS_MACOSX)
89 return gfx::VectorIconId::AUTOLOGIN; 96 return gfx::VectorIconId::AUTOLOGIN;
90 #else 97 #else
91 return gfx::VectorIconId::VECTOR_ICON_NONE; 98 return gfx::VectorIconId::VECTOR_ICON_NONE;
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 int render_frame_id, 131 int render_frame_id,
125 int cert_error) { 132 int cert_error) {
126 WebContents* web_contents = WebContents::FromRenderFrameHost( 133 WebContents* web_contents = WebContents::FromRenderFrameHost(
127 RenderFrameHost::FromID(render_process_id, render_frame_id)); 134 RenderFrameHost::FromID(render_process_id, render_frame_id));
128 if (!web_contents) 135 if (!web_contents)
129 return; 136 return;
130 137
131 // TODO(davidben): Use a more appropriate icon. 138 // TODO(davidben): Use a more appropriate icon.
132 // TODO(davidben): Display a more user-friendly error string. 139 // TODO(davidben): Display a more user-friendly error string.
133 SimpleAlertInfoBarDelegate::Create( 140 SimpleAlertInfoBarDelegate::Create(
134 InfoBarService::FromWebContents(web_contents), IDR_INFOBAR_SAVE_PASSWORD, 141 InfoBarService::FromWebContents(web_contents),
142 infobars::InfoBarDelegate::SSL_ADD_CERTIFICATE,
143 IDR_INFOBAR_SAVE_PASSWORD,
135 #if !defined(OS_MACOSX) 144 #if !defined(OS_MACOSX)
136 gfx::VectorIconId::AUTOLOGIN, 145 gfx::VectorIconId::AUTOLOGIN,
137 #else 146 #else
138 gfx::VectorIconId::VECTOR_ICON_NONE, 147 gfx::VectorIconId::VECTOR_ICON_NONE,
139 #endif 148 #endif
140 l10n_util::GetStringFUTF16( 149 l10n_util::GetStringFUTF16(
141 IDS_ADD_CERT_ERR_INVALID_CERT, base::IntToString16(-cert_error), 150 IDS_ADD_CERT_ERR_INVALID_CERT, base::IntToString16(-cert_error),
142 base::ASCIIToUTF16(net::ErrorToString(cert_error))), 151 base::ASCIIToUTF16(net::ErrorToString(cert_error))),
143 true); 152 true);
144 } 153 }
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 render_process_id, render_frame_id, cert_error)); 211 render_process_id, render_frame_id, cert_error));
203 } else { 212 } else {
204 BrowserThread::PostTask( 213 BrowserThread::PostTask(
205 BrowserThread::UI, FROM_HERE, 214 BrowserThread::UI, FROM_HERE,
206 base::Bind(&ShowSuccessInfoBar, 215 base::Bind(&ShowSuccessInfoBar,
207 render_process_id, render_frame_id, cert)); 216 render_process_id, render_frame_id, cert));
208 } 217 }
209 } 218 }
210 219
211 } // namespace chrome 220 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698