chrome/renderer/extensions/chrome_extensions_dispatcher_delegate.cc - Issue 571213003: Revert "Embedded Extension Options: remove flags and trunk channel restrictions"

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 571213003: Revert "Embedded Extension Options: remove flags and trunk channel restrictions" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/common/extensions/manifest_tests/extension_manifests_options_unittest.cc ('k') | extensions/browser/guest_view/extension_options/extension_options_apitest.cc » ('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 9ec82467cd70677edcb743a9a003b3f23c16fe32..75768e6550d93f288f63cef08732cd3d09ba38c9 100644

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

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

@@ -285,7 +285,8 @@ void ChromeExtensionsDispatcherDelegate::RequireAdditionalModules(

module_system->Require("denyAppView");

}

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

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

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

module_system->Require("extensionOptions");

}