extensions/common/manifest_handlers/options_page_info.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: extensions/common/manifest_handlers/options_page_info.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

Index: extensions/common/manifest_handlers/options_page_info.cc

diff --git a/extensions/common/manifest_handlers/options_page_info.cc b/extensions/common/manifest_handlers/options_page_info.cc

index 0a92b04a44562b0a41719be5357299324dea690b..e669f0c49fae15e53611fee62181deddf4c9d6a2 100644

--- a/extensions/common/manifest_handlers/options_page_info.cc

+++ b/extensions/common/manifest_handlers/options_page_info.cc

@@ -112,10 +112,11 @@ scoped_ptr<OptionsPageInfo> OptionsPageInfo::Create(

base::string16* error) {

GURL options_page;

bool chrome_style = false;

- bool open_in_tab = false;

+ bool open_in_tab = !FeatureSwitch::embedded_extension_options()->IsEnabled();

// Parse the options_ui object.

- if (options_ui_value) {

+ if (options_ui_value &&

+ FeatureSwitch::embedded_extension_options()->IsEnabled()) {

base::string16 options_ui_error;

scoped_ptr<OptionsUI> options_ui =

« no previous file with comments | « extensions/common/feature_switch.cc ('k') | extensions/common/switches.h » ('j') | no next file with comments »