content/shell/browser/shell_content_browser_client.h - Issue 282103004: Rename ProtocolInterceptJobFactory and make it not use ProtocolHandlers.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/shell/browser/shell_content_browser_client.h

Issue 282103004: Rename ProtocolInterceptJobFactory and make it not use ProtocolHandlers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix 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 | « content/shell/browser/shell_browser_context.cc ('k') | content/shell/browser/shell_content_browser_client.cc » ('j') | net/url_request/url_request_interceptor.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/shell/browser/shell_content_browser_client.h

diff --git a/content/shell/browser/shell_content_browser_client.h b/content/shell/browser/shell_content_browser_client.h

index 65b9537ab9a497278a5a1a271059b7e6980c8aad..80d6d2c7b7f250f2eadba1198392573fa6801e82 100644

--- a/content/shell/browser/shell_content_browser_client.h

+++ b/content/shell/browser/shell_content_browser_client.h

@@ -36,13 +36,13 @@ class ShellContentBrowserClient : public ContentBrowserClient {

virtual net::URLRequestContextGetter* CreateRequestContext(

BrowserContext* browser_context,

ProtocolHandlerMap* protocol_handlers,

- ProtocolHandlerScopedVector protocol_interceptors) OVERRIDE;

+ content::URLRequestInterceptorScopedVector request_interceptors) OVERRIDE;

virtual net::URLRequestContextGetter* CreateRequestContextForStoragePartition(

BrowserContext* browser_context,

const base::FilePath& partition_path,

bool in_memory,

ProtocolHandlerMap* protocol_handlers,

- ProtocolHandlerScopedVector protocol_interceptors) OVERRIDE;

+ content::URLRequestInterceptorScopedVector request_interceptors) OVERRIDE;

virtual bool IsHandledURL(const GURL& url) OVERRIDE;

virtual void AppendExtraCommandLineSwitches(base::CommandLine* command_line,

int child_process_id) OVERRIDE;