| Index: chrome/browser/ui/webui/extensions/extension_settings_handler.cc
|
| diff --git a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc
|
| index 334420a2b8b4e30982171c95832e4c6d72417bcf..8c088c1bf078354d146135ba97e51b0ad6208a45 100644
|
| --- a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc
|
| +++ b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc
|
| @@ -92,6 +92,7 @@
|
| #include "extensions/common/manifest.h"
|
| #include "extensions/common/manifest_handlers/background_info.h"
|
| #include "extensions/common/manifest_handlers/incognito_info.h"
|
| +#include "extensions/common/manifest_handlers/options_page_info.h"
|
| #include "extensions/common/permissions/permissions_data.h"
|
| #include "extensions/common/switches.h"
|
| #include "grit/browser_resources.h"
|
| @@ -270,6 +271,8 @@ base::DictionaryValue* ExtensionSettingsHandler::CreateExtensionDetailValue(
|
| extension_data->SetBoolean("is_platform_app", extension->is_platform_app());
|
| extension_data->SetBoolean("homepageProvided",
|
| ManifestURL::GetHomepageURL(extension).is_valid());
|
| + extension_data->SetBoolean("options_open_in_tab",
|
| + OptionsPageInfo::ShouldOpenInTab(extension));
|
|
|
| // Add dependent extensions.
|
| base::ListValue* dependents_list = new base::ListValue;
|
| @@ -891,10 +894,6 @@ void ExtensionSettingsHandler::HandleRequestExtensionsData(
|
| ExtensionPrefs::Get(profile)->ExtensionsBlacklistedByDefault();
|
| results.SetBoolean("loadUnpackedDisabled", load_unpacked_disabled);
|
|
|
| - results.SetBoolean(
|
| - "enableEmbeddedExtensionOptions",
|
| - extensions::FeatureSwitch::embedded_extension_options()->IsEnabled());
|
| -
|
| web_ui()->CallJavascriptFunction(
|
| "extensions.ExtensionSettings.returnExtensionsData", results);
|
|
|
| @@ -1125,7 +1124,7 @@ void ExtensionSettingsHandler::HandleUninstallMessage(
|
| void ExtensionSettingsHandler::HandleOptionsMessage(
|
| const base::ListValue* args) {
|
| const Extension* extension = GetActiveExtension(args);
|
| - if (!extension || ManifestURL::GetOptionsPage(extension).is_empty())
|
| + if (!extension || OptionsPageInfo::GetOptionsPage(extension).is_empty())
|
| return;
|
| ExtensionTabUtil::OpenOptionsPage(extension,
|
| chrome::FindBrowserWithWebContents(web_ui()->GetWebContents()));
|
|
|