| 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 <string> | 7 #include <string> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
| 11 #include "base/command_line.h" | 11 #include "base/command_line.h" |
| 12 #include "base/string_number_conversions.h" | 12 #include "base/string_number_conversions.h" |
| 13 #include "base/utf_string_conversions.h" | 13 #include "base/utf_string_conversions.h" |
| 14 #include "base/values.h" | 14 #include "base/values.h" |
| 15 #include "chrome/browser/certificate_viewer.h" | 15 #include "chrome/browser/certificate_viewer.h" |
| 16 #include "chrome/browser/content_settings/host_content_settings_map.h" | 16 #include "chrome/browser/content_settings/host_content_settings_map.h" |
| 17 #include "chrome/browser/infobars/infobar.h" | 17 #include "chrome/browser/infobars/infobar.h" |
| 18 #include "chrome/browser/infobars/infobar_tab_helper.h" | 18 #include "chrome/browser/infobars/infobar_tab_helper.h" |
| 19 #include "chrome/browser/profiles/profile.h" | 19 #include "chrome/browser/profiles/profile.h" |
| 20 #include "chrome/browser/ssl/ssl_add_cert_handler.h" | 20 #include "chrome/browser/ssl/ssl_add_cert_handler.h" |
| 21 #include "chrome/browser/ssl_client_certificate_selector.h" | 21 #include "chrome/browser/ssl_client_certificate_selector.h" |
| 22 #include "chrome/browser/tab_contents/confirm_infobar_delegate.h" | 22 #include "chrome/browser/tab_contents/confirm_infobar_delegate.h" |
| 23 #include "chrome/browser/tab_contents/simple_alert_infobar_delegate.h" | 23 #include "chrome/browser/tab_contents/simple_alert_infobar_delegate.h" |
| 24 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" | 24 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" |
| 25 #include "chrome/common/chrome_notification_types.h" | 25 #include "chrome/common/chrome_notification_types.h" |
| 26 #include "chrome/common/chrome_switches.h" | 26 #include "chrome/common/chrome_switches.h" |
| 27 #include "content/browser/ssl/ssl_client_auth_handler.h" | 27 #include "content/browser/ssl/ssl_client_auth_handler.h" |
| 28 #include "content/browser/tab_contents/tab_contents.h" | |
| 29 #include "content/browser/tab_contents/tab_contents_view.h" | 28 #include "content/browser/tab_contents/tab_contents_view.h" |
| 30 #include "content/public/browser/notification_details.h" | 29 #include "content/public/browser/notification_details.h" |
| 31 #include "content/public/browser/notification_source.h" | 30 #include "content/public/browser/notification_source.h" |
| 31 #include "content/public/browser/web_contents.h" |
| 32 #include "grit/generated_resources.h" | 32 #include "grit/generated_resources.h" |
| 33 #include "grit/theme_resources_standard.h" | 33 #include "grit/theme_resources_standard.h" |
| 34 #include "net/base/net_errors.h" | 34 #include "net/base/net_errors.h" |
| 35 #include "net/base/x509_certificate.h" |
| 35 #include "ui/base/l10n/l10n_util.h" | 36 #include "ui/base/l10n/l10n_util.h" |
| 36 #include "ui/base/resource/resource_bundle.h" | 37 #include "ui/base/resource/resource_bundle.h" |
| 37 | 38 |
| 38 namespace { | 39 namespace { |
| 39 | 40 |
| 40 gfx::Image* GetCertIcon() { | 41 gfx::Image* GetCertIcon() { |
| 41 // TODO(davidben): use a more appropriate icon. | 42 // TODO(davidben): use a more appropriate icon. |
| 42 return &ResourceBundle::GetSharedInstance().GetNativeImageNamed( | 43 return &ResourceBundle::GetSharedInstance().GetNativeImageNamed( |
| 43 IDR_INFOBAR_SAVE_PASSWORD); | 44 IDR_INFOBAR_SAVE_PASSWORD); |
| 44 } | 45 } |
| (...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 239 TabContentsSSLHelper::SSLAddCertData* TabContentsSSLHelper::GetAddCertData( | 240 TabContentsSSLHelper::SSLAddCertData* TabContentsSSLHelper::GetAddCertData( |
| 240 SSLAddCertHandler* handler) { | 241 SSLAddCertHandler* handler) { |
| 241 // Find/create the slot. | 242 // Find/create the slot. |
| 242 linked_ptr<SSLAddCertData>& ptr_ref = | 243 linked_ptr<SSLAddCertData>& ptr_ref = |
| 243 request_id_to_add_cert_data_[handler->network_request_id()]; | 244 request_id_to_add_cert_data_[handler->network_request_id()]; |
| 244 // Fill it if necessary. | 245 // Fill it if necessary. |
| 245 if (!ptr_ref.get()) | 246 if (!ptr_ref.get()) |
| 246 ptr_ref.reset(new SSLAddCertData(tab_contents_)); | 247 ptr_ref.reset(new SSLAddCertData(tab_contents_)); |
| 247 return ptr_ref.get(); | 248 return ptr_ref.get(); |
| 248 } | 249 } |
| OLD | NEW |