chrome/renderer/extensions/chrome_extensions_dispatcher_delegate.cc - Issue 453613002: Implement support for <extensionoptions> embedding in WebUI

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/renderer/extensions/chrome_extensions_dispatcher_delegate.cc

Issue 453613002: Implement support for <extensionoptions> embedding in WebUI (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix object-src CSP override Created 6 years, 4 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

« chrome/renderer/chrome_content_renderer_client.cc ('K') | « chrome/renderer/chrome_content_renderer_client.cc ('k') | chrome/renderer/resources/extensions/extension_options.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/renderer/extensions/chrome_extensions_dispatcher_delegate.cc

diff --git a/chrome/renderer/extensions/chrome_extensions_dispatcher_delegate.cc b/chrome/renderer/extensions/chrome_extensions_dispatcher_delegate.cc

index 253dd2c13bf985f20e5af937e8a086ddbd069889..ae5ccaa3724e75b32e77b9c870e0ebd6ee2754d7 100644

--- a/chrome/renderer/extensions/chrome_extensions_dispatcher_delegate.cc

+++ b/chrome/renderer/extensions/chrome_extensions_dispatcher_delegate.cc

@@ -322,10 +322,8 @@ void ChromeExtensionsDispatcherDelegate::RequireAdditionalModules(

}

- if (context_type == extensions::Feature::BLESSED_EXTENSION_CONTEXT &&

- extensions::FeatureSwitch::embedded_extension_options()->IsEnabled() &&

- extension->permissions_data()->HasAPIPermission(

- extensions::APIPermission::kEmbeddedExtensionOptions)) {

+ if (extensions::FeatureSwitch::embedded_extension_options()->IsEnabled() &&

+ context->GetAvailability("extensionOptionsInternal").is_available()) {

module_system->Require("extensionOptions");

}