| 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 0c1ecfa077bf147bd583984e2c13f415fc28b80b..2c291e8f8e71b2aa1ce1c5b018482d2b30ad2a99 100644
|
| --- a/extensions/common/manifest_handlers/options_page_info.cc
|
| +++ b/extensions/common/manifest_handlers/options_page_info.cc
|
| @@ -112,11 +112,10 @@ scoped_ptr<OptionsPageInfo> OptionsPageInfo::Create(
|
| base::string16* error) {
|
| GURL options_page;
|
| bool chrome_style = false;
|
| - bool open_in_tab = !FeatureSwitch::embedded_extension_options()->IsEnabled();
|
| + bool open_in_tab = false;
|
|
|
| // Parse the options_ui object.
|
| - if (options_ui_value &&
|
| - FeatureSwitch::embedded_extension_options()->IsEnabled()) {
|
| + if (options_ui_value) {
|
| base::string16 options_ui_error;
|
|
|
| scoped_ptr<OptionsUI> options_ui =
|
|
|