OLD | NEW |
---|---|
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/tab_contents/tab_contents_ssl_helper.h" | 5 #include "chrome/browser/tab_contents/tab_contents_ssl_helper.h" |
6 | 6 |
7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
8 #include "base/string_number_conversions.h" | 8 #include "base/string_number_conversions.h" |
9 #include "base/utf_string_conversions.h" | 9 #include "base/utf_string_conversions.h" |
10 #include "chrome/browser/ssl/ssl_add_cert_handler.h" | 10 #include "chrome/browser/ssl/ssl_add_cert_handler.h" |
11 #include "chrome/browser/ssl/ssl_client_auth_handler.h" | 11 #include "chrome/browser/ssl/ssl_client_auth_handler.h" |
12 #include "chrome/browser/ssl_client_certificate_selector.h" | 12 #include "chrome/browser/ssl_client_certificate_selector.h" |
13 #include "chrome/browser/tab_contents/infobar_delegate.h" | 13 #include "chrome/browser/tab_contents/confirm_infobar_delegate.h" |
14 #include "chrome/browser/tab_contents/simple_alert_infobar_delegate.h" | |
14 #include "chrome/common/notification_details.h" | 15 #include "chrome/common/notification_details.h" |
15 #include "chrome/common/notification_source.h" | 16 #include "chrome/common/notification_source.h" |
16 #include "content/browser/certificate_viewer.h" | 17 #include "content/browser/certificate_viewer.h" |
17 #include "content/browser/tab_contents/tab_contents.h" | 18 #include "content/browser/tab_contents/tab_contents.h" |
18 #include "grit/generated_resources.h" | 19 #include "grit/generated_resources.h" |
19 #include "grit/theme_resources.h" | 20 #include "grit/theme_resources.h" |
20 #include "net/base/net_errors.h" | 21 #include "net/base/net_errors.h" |
21 #include "ui/base/l10n/l10n_util.h" | 22 #include "ui/base/l10n/l10n_util.h" |
22 #include "ui/base/resource/resource_bundle.h" | 23 #include "ui/base/resource/resource_bundle.h" |
23 | 24 |
24 namespace { | 25 namespace { |
25 | 26 |
26 SkBitmap* GetCertIcon() { | 27 SkBitmap* GetCertIcon() { |
27 // TODO(davidben): use a more appropriate icon. | 28 // TODO(davidben): use a more appropriate icon. |
28 return ResourceBundle::GetSharedInstance().GetBitmapNamed( | 29 return ResourceBundle::GetSharedInstance().GetBitmapNamed( |
29 IDR_INFOBAR_SAVE_PASSWORD); | 30 IDR_INFOBAR_SAVE_PASSWORD); |
30 } | 31 } |
31 | 32 |
Peter Kasting
2011/03/01 19:10:37
Nit: This blank line can stay
tfarina
2011/03/02 01:47:13
Done.
| |
32 | |
33 // SSLCertAddedInfoBarDelegate ------------------------------------------------ | 33 // SSLCertAddedInfoBarDelegate ------------------------------------------------ |
34 | 34 |
35 class SSLCertAddedInfoBarDelegate : public ConfirmInfoBarDelegate { | 35 class SSLCertAddedInfoBarDelegate : public ConfirmInfoBarDelegate { |
36 public: | 36 public: |
37 SSLCertAddedInfoBarDelegate(TabContents* tab_contents, | 37 SSLCertAddedInfoBarDelegate(TabContents* tab_contents, |
38 net::X509Certificate* cert); | 38 net::X509Certificate* cert); |
39 | 39 |
40 private: | 40 private: |
41 virtual ~SSLCertAddedInfoBarDelegate(); | 41 virtual ~SSLCertAddedInfoBarDelegate(); |
42 | 42 |
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
227 TabContentsSSLHelper::SSLAddCertData* TabContentsSSLHelper::GetAddCertData( | 227 TabContentsSSLHelper::SSLAddCertData* TabContentsSSLHelper::GetAddCertData( |
228 SSLAddCertHandler* handler) { | 228 SSLAddCertHandler* handler) { |
229 // Find/create the slot. | 229 // Find/create the slot. |
230 linked_ptr<SSLAddCertData>& ptr_ref = | 230 linked_ptr<SSLAddCertData>& ptr_ref = |
231 request_id_to_add_cert_data_[handler->network_request_id()]; | 231 request_id_to_add_cert_data_[handler->network_request_id()]; |
232 // Fill it if necessary. | 232 // Fill it if necessary. |
233 if (!ptr_ref.get()) | 233 if (!ptr_ref.get()) |
234 ptr_ref.reset(new SSLAddCertData(tab_contents_)); | 234 ptr_ref.reset(new SSLAddCertData(tab_contents_)); |
235 return ptr_ref.get(); | 235 return ptr_ref.get(); |
236 } | 236 } |
OLD | NEW |