diff options
Diffstat (limited to 'android_webview')
-rw-r--r-- | android_webview/browser/aw_content_browser_client.cc | 11 | ||||
-rw-r--r-- | android_webview/browser/aw_content_browser_client.h | 6 |
2 files changed, 11 insertions, 6 deletions
diff --git a/android_webview/browser/aw_content_browser_client.cc b/android_webview/browser/aw_content_browser_client.cc index dcca91d..90f4def 100644 --- a/android_webview/browser/aw_content_browser_client.cc +++ b/android_webview/browser/aw_content_browser_client.cc @@ -209,11 +209,13 @@ void AwContentBrowserClient::RenderProcessWillLaunch( host->AddFilter(new AwContentsMessageFilter(host->GetID())); } -net::URLRequestContextGetter* -AwContentBrowserClient::CreateRequestContext( +net::URLRequestContextGetter* AwContentBrowserClient::CreateRequestContext( content::BrowserContext* browser_context, - content::ProtocolHandlerMap* protocol_handlers) { + content::ProtocolHandlerMap* protocol_handlers, + content::ProtocolHandlerScopedVector protocol_interceptors) { DCHECK(browser_context_.get() == browser_context); + // TODO(mkosiba,kinuko): protocol_interceptors should be hooked up in the + // downstream. (crbug.com/350286) return browser_context_->CreateRequestContext(protocol_handlers); } @@ -222,7 +224,8 @@ AwContentBrowserClient::CreateRequestContextForStoragePartition( content::BrowserContext* browser_context, const base::FilePath& partition_path, bool in_memory, - content::ProtocolHandlerMap* protocol_handlers) { + content::ProtocolHandlerMap* protocol_handlers, + content::ProtocolHandlerScopedVector protocol_interceptors) { DCHECK(browser_context_.get() == browser_context); return browser_context_->CreateRequestContextForStoragePartition( partition_path, in_memory, protocol_handlers); diff --git a/android_webview/browser/aw_content_browser_client.h b/android_webview/browser/aw_content_browser_client.h index 9ed0c6e..eb601cd 100644 --- a/android_webview/browser/aw_content_browser_client.h +++ b/android_webview/browser/aw_content_browser_client.h @@ -45,12 +45,14 @@ class AwContentBrowserClient : public content::ContentBrowserClient { content::RenderProcessHost* host) OVERRIDE; virtual net::URLRequestContextGetter* CreateRequestContext( content::BrowserContext* browser_context, - content::ProtocolHandlerMap* protocol_handlers) OVERRIDE; + content::ProtocolHandlerMap* protocol_handlers, + content::ProtocolHandlerScopedVector protocol_interceptors) OVERRIDE; virtual net::URLRequestContextGetter* CreateRequestContextForStoragePartition( content::BrowserContext* browser_context, const base::FilePath& partition_path, bool in_memory, - content::ProtocolHandlerMap* protocol_handlers) OVERRIDE; + content::ProtocolHandlerMap* protocol_handlers, + content::ProtocolHandlerScopedVector protocol_interceptors) OVERRIDE; virtual std::string GetCanonicalEncodingNameByAliasName( const std::string& alias_name) OVERRIDE; virtual void AppendExtraCommandLineSwitches(CommandLine* command_line, |