diff options
| author | mmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-30 17:56:15 +0000 |
|---|---|---|
| committer | mmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-30 17:56:15 +0000 |
| commit | 3b90aab39f6ce8b1319d34cbf00795e707d37ddc (patch) | |
| tree | ebfec4af454f844188c59dbd94fedb60dc7db3c2 /ui/views_content_client | |
| parent | d8a4aec8579e3cf78af5bfc16616287a109148fb (diff) | |
| download | chromium_src-3b90aab39f6ce8b1319d34cbf00795e707d37ddc.zip chromium_src-3b90aab39f6ce8b1319d34cbf00795e707d37ddc.tar.gz chromium_src-3b90aab39f6ce8b1319d34cbf00795e707d37ddc.tar.bz2 | |
Rename ProtocolInterceptJobFactory and make it not use ProtocolHandlers.
ProtocolHandlers are intended to handle all requests for a particular
scheme, while UrlRequestInterceptors are intended to sit in front of
ProtocolHandlers, and optionally take over handling of any request,
regardless of scheme.
Separating the classes removes some ambiguity and weirdness,
particularly when passing a bunch of interceptors all over the place
from content/ to chrome/ during initialization.
BUG=373800
Review URL: https://codereview.chromium.org/282103004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@273874 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views_content_client')
| -rw-r--r-- | ui/views_content_client/views_content_browser_client.cc | 4 | ||||
| -rw-r--r-- | ui/views_content_client/views_content_browser_client.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ui/views_content_client/views_content_browser_client.cc b/ui/views_content_client/views_content_browser_client.cc index 197f828..c886506 100644 --- a/ui/views_content_client/views_content_browser_client.cc +++ b/ui/views_content_client/views_content_browser_client.cc @@ -29,11 +29,11 @@ net::URLRequestContextGetter* ViewsContentBrowserClient::CreateRequestContext( content::BrowserContext* content_browser_context, content::ProtocolHandlerMap* protocol_handlers, - content::ProtocolHandlerScopedVector protocol_interceptors) { + content::URLRequestInterceptorScopedVector request_interceptors) { content::ShellBrowserContext* shell_context = views_content_main_parts_->browser_context(); return shell_context->CreateRequestContext(protocol_handlers, - protocol_interceptors.Pass()); + request_interceptors.Pass()); } } // namespace ui diff --git a/ui/views_content_client/views_content_browser_client.h b/ui/views_content_client/views_content_browser_client.h index c27e5d0..f01cd3a 100644 --- a/ui/views_content_client/views_content_browser_client.h +++ b/ui/views_content_client/views_content_browser_client.h @@ -29,7 +29,7 @@ class ViewsContentBrowserClient : public content::ContentBrowserClient { virtual net::URLRequestContextGetter* CreateRequestContext( content::BrowserContext* browser_context, content::ProtocolHandlerMap* protocol_handlers, - content::ProtocolHandlerScopedVector protocol_interceptors) OVERRIDE; + content::URLRequestInterceptorScopedVector request_interceptors) OVERRIDE; private: ViewsContentClientMainParts* views_content_main_parts_; |