| 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/confirm_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/browser/tab_contents/simple_alert_infobar_delegate.h" | 
| 15 #include "content/browser/certificate_viewer.h" | 15 #include "content/browser/certificate_viewer.h" | 
| 16 #include "content/browser/tab_contents/tab_contents.h" | 16 #include "content/browser/tab_contents/tab_contents.h" | 
| 17 #include "content/common/notification_details.h" | 17 #include "content/common/notification_details.h" | 
| 18 #include "content/common/notification_source.h" | 18 #include "content/common/notification_source.h" | 
| 19 #include "grit/generated_resources.h" | 19 #include "grit/generated_resources.h" | 
| 20 #include "grit/theme_resources.h" | 20 #include "grit/theme_resources_standard.h" | 
| 21 #include "net/base/net_errors.h" | 21 #include "net/base/net_errors.h" | 
| 22 #include "ui/base/l10n/l10n_util.h" | 22 #include "ui/base/l10n/l10n_util.h" | 
| 23 #include "ui/base/resource/resource_bundle.h" | 23 #include "ui/base/resource/resource_bundle.h" | 
| 24 | 24 | 
| 25 namespace { | 25 namespace { | 
| 26 | 26 | 
| 27 gfx::Image* GetCertIcon() { | 27 gfx::Image* GetCertIcon() { | 
| 28   // TODO(davidben): use a more appropriate icon. | 28   // TODO(davidben): use a more appropriate icon. | 
| 29   return &ResourceBundle::GetSharedInstance().GetNativeImageNamed( | 29   return &ResourceBundle::GetSharedInstance().GetNativeImageNamed( | 
| 30       IDR_INFOBAR_SAVE_PASSWORD); | 30       IDR_INFOBAR_SAVE_PASSWORD); | 
| (...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 228 TabContentsSSLHelper::SSLAddCertData* TabContentsSSLHelper::GetAddCertData( | 228 TabContentsSSLHelper::SSLAddCertData* TabContentsSSLHelper::GetAddCertData( | 
| 229     SSLAddCertHandler* handler) { | 229     SSLAddCertHandler* handler) { | 
| 230   // Find/create the slot. | 230   // Find/create the slot. | 
| 231   linked_ptr<SSLAddCertData>& ptr_ref = | 231   linked_ptr<SSLAddCertData>& ptr_ref = | 
| 232       request_id_to_add_cert_data_[handler->network_request_id()]; | 232       request_id_to_add_cert_data_[handler->network_request_id()]; | 
| 233   // Fill it if necessary. | 233   // Fill it if necessary. | 
| 234   if (!ptr_ref.get()) | 234   if (!ptr_ref.get()) | 
| 235     ptr_ref.reset(new SSLAddCertData(tab_contents_)); | 235     ptr_ref.reset(new SSLAddCertData(tab_contents_)); | 
| 236   return ptr_ref.get(); | 236   return ptr_ref.get(); | 
| 237 } | 237 } | 
| OLD | NEW | 
|---|