content/shell/browser/shell_content_browser_client.h - Issue 2321543002: Merge CrossSiteResourceHandler and NavigationResourceThrottle

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 2321543002: Merge CrossSiteResourceHandler and NavigationResourceThrottle (Closed)

Patch Set: Fixed test compilation error Created 4 years, 3 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:

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 e378b1f99991dde28da0195a2a292d8102d42760..3406d86937241b76d949f46141ac82f817a812fa 100644

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

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

@@ -55,7 +55,7 @@ class ShellContentBrowserClient : public ContentBrowserClient {

SpeechRecognitionManagerDelegate* CreateSpeechRecognitionManagerDelegate()

override;

net::NetLog* GetNetLog() override;

- bool ShouldSwapProcessesForRedirect(ResourceContext* resource_context,

+ bool ShouldSwapProcessesForRedirect(BrowserContext* browser_context,

const GURL& current_url,

const GURL& new_url) override;

DevToolsManagerDelegate* GetDevToolsManagerDelegate() override;