extensions/browser/extension_protocols.cc - Issue 425653002: content: ResourceType cleanup.

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: extensions/browser/extension_protocols.cc

Issue 425653002: content: ResourceType cleanup. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: REBASE Created 6 years, 5 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: extensions/browser/extension_protocols.cc

diff --git a/extensions/browser/extension_protocols.cc b/extensions/browser/extension_protocols.cc

index e4cd193e9d836ae5553fb73cb299e68e1cdf251e..87a9e0e80b0d1bf45bd3971d6c961d50d37d1267 100644

--- a/extensions/browser/extension_protocols.cc

+++ b/extensions/browser/extension_protocols.cc

@@ -296,7 +296,7 @@ bool ExtensionCanLoadInIncognito(const ResourceRequestInfo* info,

// Only allow incognito toplevel navigations to extension resources in

// split mode. In spanning mode, the extension must run in a single process,

// and an incognito tab prevents that.

- if (info->GetResourceType() == ResourceType::MAIN_FRAME) {

+ if (info->GetResourceType() == content::RESOURCE_TYPE_MAIN_FRAME) {

const Extension* extension =

extension_info_map->extensions().GetByID(extension_id);

return extension && extensions::IncognitoInfo::IsSplitMode(extension);