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

Unified Diff: apps/shell/browser/shell_content_browser_client.cc

Issue 187223003: Allow content layer to pass ProtocolInterceptors when we create URLRequestContext (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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
Index: apps/shell/browser/shell_content_browser_client.cc
diff --git a/apps/shell/browser/shell_content_browser_client.cc b/apps/shell/browser/shell_content_browser_client.cc
index 554285a31851c6afaba776ef657139f68f3bef52..e5260d0b162e43f33a7cf8b2ab9dee3d8d36e2db 100644
--- a/apps/shell/browser/shell_content_browser_client.cc
+++ b/apps/shell/browser/shell_content_browser_client.cc
@@ -60,10 +60,10 @@ bool ShellContentBrowserClient::ShouldUseProcessPerSite(
return true;
}
-net::URLRequestContextGetter*
-ShellContentBrowserClient::CreateRequestContext(
+net::URLRequestContextGetter* ShellContentBrowserClient::CreateRequestContext(
content::BrowserContext* content_browser_context,
- content::ProtocolHandlerMap* protocol_handlers) {
+ content::ProtocolHandlerMap* protocol_handlers,
+ content::ProtocolHandlerScopedVector protocol_interceptors) {
// Handle chrome-extension: and chrome-extension-resource: requests.
extensions::InfoMap* extension_info_map =
browser_main_parts_->extension_system()->info_map();
@@ -76,7 +76,7 @@ ShellContentBrowserClient::CreateRequestContext(
CreateExtensionResourceProtocolHandler());
// Let content::ShellBrowserContext handle the rest of the setup.
return browser_main_parts_->browser_context()->CreateRequestContext(
- protocol_handlers);
+ protocol_handlers, protocol_interceptors.Pass());
}
bool ShellContentBrowserClient::IsHandledURL(const GURL& url) {

Powered by Google App Engine
This is Rietveld 408576698