| 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 "content/browser/ssl/ssl_manager.h" | 5 #include "content/browser/ssl/ssl_manager.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/utf_string_conversions.h" | 8 #include "base/utf_string_conversions.h" |
| 9 #include "content/browser/load_from_memory_cache_details.h" | 9 #include "content/browser/load_from_memory_cache_details.h" |
| 10 #include "content/browser/renderer_host/resource_dispatcher_host.h" | 10 #include "content/browser/renderer_host/resource_dispatcher_host.h" |
| 11 #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h" | 11 #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h" |
| 12 #include "content/browser/renderer_host/resource_request_details.h" | 12 #include "content/browser/renderer_host/resource_request_details.h" |
| 13 #include "content/browser/ssl/ssl_cert_error_handler.h" | 13 #include "content/browser/ssl/ssl_cert_error_handler.h" |
| 14 #include "content/browser/ssl/ssl_policy.h" | 14 #include "content/browser/ssl/ssl_policy.h" |
| 15 #include "content/browser/ssl/ssl_request_info.h" | 15 #include "content/browser/ssl/ssl_request_info.h" |
| 16 #include "content/browser/tab_contents/navigation_details.h" | 16 #include "content/browser/tab_contents/navigation_details.h" |
| 17 #include "content/browser/tab_contents/navigation_entry.h" | 17 #include "content/browser/tab_contents/navigation_entry.h" |
| 18 #include "content/browser/tab_contents/provisional_load_details.h" | 18 #include "content/browser/tab_contents/provisional_load_details.h" |
| 19 #include "content/browser/tab_contents/tab_contents.h" | 19 #include "content/browser/tab_contents/tab_contents.h" |
| 20 #include "content/public/browser/browser_thread.h" | 20 #include "content/public/browser/browser_thread.h" |
| 21 #include "content/public/browser/notification_service.h" | 21 #include "content/public/browser/notification_service.h" |
| 22 #include "content/public/browser/notification_source.h" | 22 #include "content/public/browser/notification_source.h" |
| 23 #include "net/base/cert_status_flags.h" | 23 #include "net/base/cert_status_flags.h" |
| 24 | 24 |
| 25 using content::BrowserThread; |
| 26 |
| 25 // static | 27 // static |
| 26 void SSLManager::OnSSLCertificateError(ResourceDispatcherHost* rdh, | 28 void SSLManager::OnSSLCertificateError(ResourceDispatcherHost* rdh, |
| 27 net::URLRequest* request, | 29 net::URLRequest* request, |
| 28 const net::SSLInfo& ssl_info, | 30 const net::SSLInfo& ssl_info, |
| 29 bool is_hsts_host) { | 31 bool is_hsts_host) { |
| 30 DVLOG(1) << "OnSSLCertificateError() cert_error: " | 32 DVLOG(1) << "OnSSLCertificateError() cert_error: " |
| 31 << net::MapCertStatusToNetError(ssl_info.cert_status) | 33 << net::MapCertStatusToNetError(ssl_info.cert_status) |
| 32 << " url: " << request->url().spec() | 34 << " url: " << request->url().spec() |
| 33 << " cert_status: " << std::hex << ssl_info.cert_status; | 35 << " cert_status: " << std::hex << ssl_info.cert_status; |
| 34 | 36 |
| (...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 249 | 251 |
| 250 policy()->UpdateEntry(entry, controller_->tab_contents()); | 252 policy()->UpdateEntry(entry, controller_->tab_contents()); |
| 251 | 253 |
| 252 if (!entry->ssl().Equals(original_ssl_status)) { | 254 if (!entry->ssl().Equals(original_ssl_status)) { |
| 253 content::NotificationService::current()->Notify( | 255 content::NotificationService::current()->Notify( |
| 254 content::NOTIFICATION_SSL_VISIBLE_STATE_CHANGED, | 256 content::NOTIFICATION_SSL_VISIBLE_STATE_CHANGED, |
| 255 content::Source<NavigationController>(controller_), | 257 content::Source<NavigationController>(controller_), |
| 256 content::NotificationService::NoDetails()); | 258 content::NotificationService::NoDetails()); |
| 257 } | 259 } |
| 258 } | 260 } |
| OLD | NEW |