| OLD | NEW |
| 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_tab_helper.h" | 5 #include "chrome/browser/ssl/ssl_tab_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/strings/string_number_conversions.h" | 12 #include "base/strings/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/api/infobars/confirm_infobar_delegate.h" | 15 #include "chrome/browser/api/infobars/confirm_infobar_delegate.h" |
| 16 #include "chrome/browser/api/infobars/infobar_service.h" | 16 #include "chrome/browser/api/infobars/infobar_service.h" |
| 17 #include "chrome/browser/certificate_viewer.h" | 17 #include "chrome/browser/certificate_viewer.h" |
| 18 #include "chrome/browser/content_settings/host_content_settings_map.h" | 18 #include "chrome/browser/content_settings/host_content_settings_map.h" |
| 19 #include "chrome/browser/infobars/infobar.h" | 19 #include "chrome/browser/infobars/infobar.h" |
| 20 #include "chrome/browser/profiles/profile.h" | 20 #include "chrome/browser/profiles/profile.h" |
| 21 #include "chrome/browser/ssl/ssl_add_cert_handler.h" | 21 #include "chrome/browser/ssl/ssl_add_cert_handler.h" |
| 22 #include "chrome/browser/ssl/ssl_client_certificate_selector.h" | 22 #include "chrome/browser/ssl/ssl_client_certificate_selector.h" |
| 23 #include "chrome/browser/ui/browser_finder.h" | |
| 24 #include "chrome/common/chrome_notification_types.h" | 23 #include "chrome/common/chrome_notification_types.h" |
| 25 #include "chrome/common/chrome_switches.h" | 24 #include "chrome/common/chrome_switches.h" |
| 26 #include "content/public/browser/notification_details.h" | 25 #include "content/public/browser/notification_details.h" |
| 27 #include "content/public/browser/notification_observer.h" | 26 #include "content/public/browser/notification_observer.h" |
| 28 #include "content/public/browser/notification_registrar.h" | 27 #include "content/public/browser/notification_registrar.h" |
| 29 #include "content/public/browser/notification_source.h" | 28 #include "content/public/browser/notification_source.h" |
| 30 #include "content/public/browser/web_contents.h" | 29 #include "content/public/browser/web_contents.h" |
| 31 #include "content/public/browser/web_contents_view.h" | 30 #include "content/public/browser/web_contents_view.h" |
| 32 #include "grit/generated_resources.h" | 31 #include "grit/generated_resources.h" |
| 33 #include "grit/theme_resources.h" | 32 #include "grit/theme_resources.h" |
| (...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 185 content::Details<InfoBarReplacedDetails>(details)->first)) | 184 content::Details<InfoBarReplacedDetails>(details)->first)) |
| 186 infobar_delegate_ = NULL; | 185 infobar_delegate_ = NULL; |
| 187 } | 186 } |
| 188 | 187 |
| 189 | 188 |
| 190 // SSLTabHelper ---------------------------------------------------------------- | 189 // SSLTabHelper ---------------------------------------------------------------- |
| 191 | 190 |
| 192 DEFINE_WEB_CONTENTS_USER_DATA_KEY(SSLTabHelper); | 191 DEFINE_WEB_CONTENTS_USER_DATA_KEY(SSLTabHelper); |
| 193 | 192 |
| 194 SSLTabHelper::SSLTabHelper(content::WebContents* contents) | 193 SSLTabHelper::SSLTabHelper(content::WebContents* contents) |
| 195 : WebContentsObserver(contents), | 194 : web_contents_(contents) { |
| 196 web_contents_(contents) { | |
| 197 } | 195 } |
| 198 | 196 |
| 199 SSLTabHelper::~SSLTabHelper() { | 197 SSLTabHelper::~SSLTabHelper() { |
| 200 } | 198 } |
| 201 | 199 |
| 202 void SSLTabHelper::DidChangeVisibleSSLState() { | |
| 203 #if !defined(OS_ANDROID) | |
| 204 Browser* browser = chrome::FindBrowserWithWebContents(web_contents_); | |
| 205 if (browser) | |
| 206 browser->VisibleSSLStateChanged(web_contents_); | |
| 207 #endif // !defined(OS_ANDROID) | |
| 208 } | |
| 209 | |
| 210 void SSLTabHelper::ShowClientCertificateRequestDialog( | 200 void SSLTabHelper::ShowClientCertificateRequestDialog( |
| 211 const net::HttpNetworkSession* network_session, | 201 const net::HttpNetworkSession* network_session, |
| 212 net::SSLCertRequestInfo* cert_request_info, | 202 net::SSLCertRequestInfo* cert_request_info, |
| 213 const base::Callback<void(net::X509Certificate*)>& callback) { | 203 const base::Callback<void(net::X509Certificate*)>& callback) { |
| 214 chrome::ShowSSLClientCertificateSelector( | 204 chrome::ShowSSLClientCertificateSelector( |
| 215 web_contents_, network_session, cert_request_info, callback); | 205 web_contents_, network_session, cert_request_info, callback); |
| 216 } | 206 } |
| 217 | 207 |
| 218 void SSLTabHelper::OnVerifyClientCertificateError( | 208 void SSLTabHelper::OnVerifyClientCertificateError( |
| 219 scoped_refptr<SSLAddCertHandler> handler, int error_code) { | 209 scoped_refptr<SSLAddCertHandler> handler, int error_code) { |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 265 SSLTabHelper::SSLAddCertData* | 255 SSLTabHelper::SSLAddCertData* |
| 266 SSLTabHelper::GetAddCertData(SSLAddCertHandler* handler) { | 256 SSLTabHelper::GetAddCertData(SSLAddCertHandler* handler) { |
| 267 // Find/create the slot. | 257 // Find/create the slot. |
| 268 linked_ptr<SSLAddCertData>& ptr_ref = | 258 linked_ptr<SSLAddCertData>& ptr_ref = |
| 269 request_id_to_add_cert_data_[handler->network_request_id()]; | 259 request_id_to_add_cert_data_[handler->network_request_id()]; |
| 270 // Fill it if necessary. | 260 // Fill it if necessary. |
| 271 if (!ptr_ref.get()) | 261 if (!ptr_ref.get()) |
| 272 ptr_ref.reset(new SSLAddCertData(web_contents_)); | 262 ptr_ref.reset(new SSLAddCertData(web_contents_)); |
| 273 return ptr_ref.get(); | 263 return ptr_ref.get(); |
| 274 } | 264 } |
| OLD | NEW |