content/public/browser/content_browser_client.cc - 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/public/browser/content_browser_client.cc

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/public/browser/content_browser_client.cc

diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc

index f742cfa421166a71867014b30db75a1b78579cb7..159e2fc72ef65d13d1468791785c5477fb7a7b58 100644

--- a/content/public/browser/content_browser_client.cc

+++ b/content/public/browser/content_browser_client.cc

@@ -108,7 +108,7 @@ std::unique_ptr<media::CdmFactory> ContentBrowserClient::CreateCdmFactory() {

}

bool ContentBrowserClient::ShouldSwapProcessesForRedirect(

- ResourceContext* resource_context, const GURL& current_url,

+ BrowserContext* browser_context, const GURL& current_url,

nasko 2016/09/08 00:35:36 nit: Each parameter on new line.

clamy 2016/09/09 15:06:41 Done.

const GURL& new_url) {

return false;

}