diff options
| author | shishir@chromium.org <shishir@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-20 01:02:00 +0000 |
|---|---|---|
| committer | shishir@chromium.org <shishir@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-20 01:02:00 +0000 |
| commit | a02cf4c035866c71252bf06d097e5bb7d8a0892c (patch) | |
| tree | 915d970c13350084b771983b1d6b8f1457883d8f /content/browser/ssl/ssl_manager.cc | |
| parent | 878b77e20f0e086730a3ba7e11d0b00b2c51dd01 (diff) | |
| download | chromium_src-a02cf4c035866c71252bf06d097e5bb7d8a0892c.zip chromium_src-a02cf4c035866c71252bf06d097e5bb7d8a0892c.tar.gz chromium_src-a02cf4c035866c71252bf06d097e5bb7d8a0892c.tar.bz2 | |
Moving LoadFromMemoryCacheDetails to content/public/browser and making it a struct.
BUG=None
TEST=None
Review URL: https://chromiumcodereview.appspot.com/10582007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@143113 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/ssl/ssl_manager.cc')
| -rw-r--r-- | content/browser/ssl/ssl_manager.cc | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/content/browser/ssl/ssl_manager.cc b/content/browser/ssl/ssl_manager.cc index 753a5f4..45c4238 100644 --- a/content/browser/ssl/ssl_manager.cc +++ b/content/browser/ssl/ssl_manager.cc @@ -6,9 +6,7 @@ #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/resource_request_details.h" #include "content/browser/renderer_host/resource_request_info_impl.h" #include "content/browser/ssl/ssl_cert_error_handler.h" #include "content/browser/ssl/ssl_policy.h" @@ -17,9 +15,11 @@ #include "content/browser/web_contents/web_contents_impl.h" #include "content/common/ssl_status_serialization.h" #include "content/public/browser/browser_thread.h" +#include "content/public/browser/load_from_memory_cache_details.h" #include "content/public/browser/navigation_details.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_source.h" +#include "content/public/browser/resource_request_details.h" #include "content/public/common/ssl_status.h" #include "net/url_request/url_request.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()); |