Chromium Code Reviews| 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 "content/browser/web_contents/web_contents_impl.h" | 5 #include "content/browser/web_contents/web_contents_impl.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <cmath> | 9 #include <cmath> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 3442 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3453 GetRenderProcessHost(), | 3453 GetRenderProcessHost(), |
| 3454 bad_message::WC_MEMORY_CACHE_RESOURCE_BAD_SECURITY_INFO); | 3454 bad_message::WC_MEMORY_CACHE_RESOURCE_BAD_SECURITY_INFO); |
| 3455 return; | 3455 return; |
| 3456 } | 3456 } |
| 3457 | 3457 |
| 3458 // Send out a notification that we loaded a resource from our memory cache. | 3458 // Send out a notification that we loaded a resource from our memory cache. |
| 3459 // TODO(alcutter,eranm): Pass signed_certificate_timestamp_ids into details. | 3459 // TODO(alcutter,eranm): Pass signed_certificate_timestamp_ids into details. |
| 3460 LoadFromMemoryCacheDetails details( | 3460 LoadFromMemoryCacheDetails details( |
| 3461 url, status.cert_id, status.cert_status, http_method, mime_type, | 3461 url, status.cert_id, status.cert_status, http_method, mime_type, |
| 3462 resource_type); | 3462 resource_type); |
| 3463 | |
| 3464 controller_.ssl_manager()->DidLoadFromMemoryCache(details); | |
| 3465 | |
| 3466 FOR_EACH_OBSERVER(WebContentsObserver, observers_, | 3463 FOR_EACH_OBSERVER(WebContentsObserver, observers_, |
| 3467 DidLoadResourceFromMemoryCache(details)); | 3464 DidLoadResourceFromMemoryCache(details)); |
|
jww
2016/08/09 02:42:18
Side question: why isn't SSLManager a WebContentsO
felt
2016/08/10 14:17:18
That's a great question. I was wondering that too.
| |
| 3468 | 3465 |
| 3469 if (url.is_valid() && url.SchemeIsHTTPOrHTTPS()) { | 3466 if (url.is_valid() && url.SchemeIsHTTPOrHTTPS()) { |
| 3470 scoped_refptr<net::URLRequestContextGetter> request_context( | 3467 scoped_refptr<net::URLRequestContextGetter> request_context( |
| 3471 resource_type == RESOURCE_TYPE_MEDIA ? | 3468 resource_type == RESOURCE_TYPE_MEDIA ? |
| 3472 GetRenderProcessHost()->GetStoragePartition()-> | 3469 GetRenderProcessHost()->GetStoragePartition()-> |
| 3473 GetMediaURLRequestContext() : | 3470 GetMediaURLRequestContext() : |
| 3474 GetRenderProcessHost()->GetStoragePartition()-> | 3471 GetRenderProcessHost()->GetStoragePartition()-> |
| 3475 GetURLRequestContext()); | 3472 GetURLRequestContext()); |
| 3476 BrowserThread::PostTask( | 3473 BrowserThread::PostTask( |
| 3477 BrowserThread::IO, | 3474 BrowserThread::IO, |
| (...skipping 1754 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 5232 for (RenderViewHost* render_view_host : render_view_host_set) | 5229 for (RenderViewHost* render_view_host : render_view_host_set) |
| 5233 render_view_host->OnWebkitPreferencesChanged(); | 5230 render_view_host->OnWebkitPreferencesChanged(); |
| 5234 } | 5231 } |
| 5235 | 5232 |
| 5236 void WebContentsImpl::SetJavaScriptDialogManagerForTesting( | 5233 void WebContentsImpl::SetJavaScriptDialogManagerForTesting( |
| 5237 JavaScriptDialogManager* dialog_manager) { | 5234 JavaScriptDialogManager* dialog_manager) { |
| 5238 dialog_manager_ = dialog_manager; | 5235 dialog_manager_ = dialog_manager; |
| 5239 } | 5236 } |
| 5240 | 5237 |
| 5241 } // namespace content | 5238 } // namespace content |
| OLD | NEW |