chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc - Issue 2397893002: Revert the merge of 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: chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc

Issue 2397893002: Revert the merge of CrossSiteResourceHandler and NavigationResourceThrottle. (Closed)

Patch Set: Add back initialization of started_from_context_menu_. Created 4 years, 2 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 | « chrome/browser/extensions/chrome_content_browser_client_extensions_part.h ('k') | chrome/browser/prerender/prerender_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc

diff --git a/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc b/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc

index ca0879d192fed96008233ff83eb019cbf965ead5..b53243a6b772eeb6cfdda91ce428ab52699dc795 100644

--- a/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc

+++ b/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc

@@ -456,11 +456,12 @@ bool ChromeContentBrowserClientExtensionsPart::

// static

bool ChromeContentBrowserClientExtensionsPart::ShouldSwapProcessesForRedirect(

- content::BrowserContext* browser_context,

+ content::ResourceContext* resource_context,

const GURL& current_url,

const GURL& new_url) {

+ ProfileIOData* io_data = ProfileIOData::FromResourceContext(resource_context);

return CrossesExtensionProcessBoundary(

- ExtensionRegistry::Get(browser_context)->enabled_extensions(),

+ io_data->GetExtensionInfoMap()->extensions(),

current_url, new_url, false);

}