OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 "app/l10n_util.h" | 7 #include "app/l10n_util.h" |
8 #include "app/resource_bundle.h" | 8 #include "app/resource_bundle.h" |
9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
10 #include "base/string_number_conversions.h" | 10 #include "base/string_number_conversions.h" |
11 #include "base/utf_string_conversions.h" | 11 #include "base/utf_string_conversions.h" |
12 #include "chrome/browser/certificate_viewer.h" | 12 #include "chrome/browser/certificate_viewer.h" |
13 #include "chrome/browser/ssl/ssl_add_cert_handler.h" | 13 #include "chrome/browser/ssl/ssl_add_cert_handler.h" |
14 #include "chrome/browser/ssl/ssl_client_auth_handler.h" | 14 #include "chrome/browser/ssl/ssl_client_auth_handler.h" |
15 #include "chrome/browser/ssl_client_certificate_selector.h" | 15 #include "chrome/browser/ssl_client_certificate_selector.h" |
16 #include "chrome/browser/tab_contents/infobar_delegate.h" | 16 #include "chrome/browser/tab_contents/infobar_delegate.h" |
17 #include "chrome/browser/tab_contents/tab_contents.h" | 17 #include "chrome/browser/tab_contents/tab_contents.h" |
18 #include "chrome/common/notification_service.h" | 18 #include "chrome/common/notification_details.h" |
| 19 #include "chrome/common/notification_source.h" |
19 #include "grit/generated_resources.h" | 20 #include "grit/generated_resources.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 | 23 |
23 namespace { | 24 namespace { |
24 | 25 |
25 SkBitmap* GetCertIcon() { | 26 SkBitmap* GetCertIcon() { |
26 // TODO(davidben): use a more appropriate icon. | 27 // TODO(davidben): use a more appropriate icon. |
27 return ResourceBundle::GetSharedInstance().GetBitmapNamed( | 28 return ResourceBundle::GetSharedInstance().GetBitmapNamed( |
28 IDR_INFOBAR_SAVE_PASSWORD); | 29 IDR_INFOBAR_SAVE_PASSWORD); |
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
213 TabContentsSSLHelper::SSLAddCertData* TabContentsSSLHelper::GetAddCertData( | 214 TabContentsSSLHelper::SSLAddCertData* TabContentsSSLHelper::GetAddCertData( |
214 SSLAddCertHandler* handler) { | 215 SSLAddCertHandler* handler) { |
215 // Find/create the slot. | 216 // Find/create the slot. |
216 linked_ptr<SSLAddCertData>& ptr_ref = | 217 linked_ptr<SSLAddCertData>& ptr_ref = |
217 request_id_to_add_cert_data_[handler->network_request_id()]; | 218 request_id_to_add_cert_data_[handler->network_request_id()]; |
218 // Fill it if necessary. | 219 // Fill it if necessary. |
219 if (!ptr_ref.get()) | 220 if (!ptr_ref.get()) |
220 ptr_ref.reset(new SSLAddCertData(tab_contents_, handler)); | 221 ptr_ref.reset(new SSLAddCertData(tab_contents_, handler)); |
221 return ptr_ref.get(); | 222 return ptr_ref.get(); |
222 } | 223 } |
OLD | NEW |