Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1087)

Unified Diff: android_webview/browser/aw_browser_context.cc

Issue 294023015: Hook up request interceptors in AndroidWebView code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « android_webview/browser/aw_browser_context.h ('k') | android_webview/browser/aw_content_browser_client.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: android_webview/browser/aw_browser_context.cc
diff --git a/android_webview/browser/aw_browser_context.cc b/android_webview/browser/aw_browser_context.cc
index 05f68e3856aff0e35015d4d8258ac3744cdd8cac..42447f95b1f670a08069be0ceaa0db5caeb24311 100644
--- a/android_webview/browser/aw_browser_context.cc
+++ b/android_webview/browser/aw_browser_context.cc
@@ -126,14 +126,16 @@ void AwBrowserContext::AddVisitedURLs(const std::vector<GURL>& urls) {
}
net::URLRequestContextGetter* AwBrowserContext::CreateRequestContext(
- content::ProtocolHandlerMap* protocol_handlers) {
+ content::ProtocolHandlerMap* protocol_handlers,
+ content::URLRequestInterceptorScopedVector request_interceptors) {
// This function cannot actually create the request context because
// there is a reentrant dependency on GetResourceContext() via
// content::StoragePartitionImplMap::Create(). This is not fixable
// until http://crbug.com/159193. Until then, assert that the context
// has already been allocated and just handle setting the protocol_handlers.
DCHECK(url_request_context_getter_);
- url_request_context_getter_->SetProtocolHandlers(protocol_handlers);
+ url_request_context_getter_->SetHandlersAndInterceptors(
+ protocol_handlers, request_interceptors.Pass());
return url_request_context_getter_;
}
@@ -141,7 +143,8 @@ net::URLRequestContextGetter*
AwBrowserContext::CreateRequestContextForStoragePartition(
const base::FilePath& partition_path,
bool in_memory,
- content::ProtocolHandlerMap* protocol_handlers) {
+ content::ProtocolHandlerMap* protocol_handlers,
+ content::URLRequestInterceptorScopedVector request_interceptors) {
NOTREACHED();
return NULL;
}
« no previous file with comments | « android_webview/browser/aw_browser_context.h ('k') | android_webview/browser/aw_content_browser_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698