Chromium Code Reviews| Index: content/browser/ssl/ssl_manager.cc |
| diff --git a/content/browser/ssl/ssl_manager.cc b/content/browser/ssl/ssl_manager.cc |
| index 753a5f4d90824b7509b96f86134a0ea3e1cc1ab9..85a34c74a8c374d6aa80fed2e2ac0a62ebd0b49f 100644 |
| --- a/content/browser/ssl/ssl_manager.cc |
| +++ b/content/browser/ssl/ssl_manager.cc |
| @@ -6,8 +6,8 @@ |
| #include "base/bind.h" |
| #include "base/utf_string_conversions.h" |
| -#include "content/browser/load_from_memory_cache_details.h" |
| #include "content/browser/renderer_host/resource_dispatcher_host_impl.h" |
| +#include "content/public/browser/load_from_memory_cache_details.h" |
|
jam
2012/06/18 23:29:01
nit: order (also below which isn't your fault:) )
Shishir
2012/06/18 23:53:46
Done.
|
| #include "content/public/browser/resource_request_details.h" |
| #include "content/browser/renderer_host/resource_request_info_impl.h" |
| #include "content/browser/ssl/ssl_cert_error_handler.h" |
| @@ -158,7 +158,7 @@ void SSLManager::Observe(int type, |
| break; |
| case content::NOTIFICATION_LOAD_FROM_MEMORY_CACHE: |
| DidLoadFromMemoryCache( |
| - content::Details<LoadFromMemoryCacheDetails>(details).ptr()); |
| + content::Details<content::LoadFromMemoryCacheDetails>(details).ptr()); |
| break; |
| case content::NOTIFICATION_SSL_INTERNAL_STATE_CHANGED: |
| DidChangeSSLInternalState(); |
| @@ -168,18 +168,19 @@ void SSLManager::Observe(int type, |
| } |
| } |
| -void SSLManager::DidLoadFromMemoryCache(LoadFromMemoryCacheDetails* details) { |
| +void SSLManager::DidLoadFromMemoryCache( |
| + content::LoadFromMemoryCacheDetails* details) { |
| // Simulate loading this resource through the usual path. |
| // Note that we specify SUB_RESOURCE as the resource type as WebCore only |
| // caches sub-resources. |
| // This resource must have been loaded with no filtering because filtered |
| // resouces aren't cachable. |
| scoped_refptr<SSLRequestInfo> info(new SSLRequestInfo( |
| - details->url(), |
| + details->url, |
| ResourceType::SUB_RESOURCE, |
| - details->pid(), |
| - details->ssl_cert_id(), |
| - details->ssl_cert_status())); |
| + details->pid, |
| + details->cert_id, |
| + details->cert_status)); |
| // Simulate loading this resource through the usual path. |
| policy()->OnRequestStarted(info.get()); |