Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(663)

Unified Diff: chrome/browser/ui/webui/extensions/extension_settings_handler.cc

Issue 518653002: Add the "options_ui" extension manifest field. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix build issue? 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: 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 6b05504d05c6ae629a58219bc967fdd244624975..34e61c4dc9038a696c5199fadb1b2fd00487742e 100644
--- a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc
+++ b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc
@@ -93,6 +93,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/components_strings.h"
@@ -270,6 +271,8 @@ base::DictionaryValue* ExtensionSettingsHandler::CreateExtensionDetailValue(
extension_data->SetBoolean("is_platform_app", extension->is_platform_app());
extension_data->SetBoolean("homepageProvided",
ManifestURL::SpecifiedHomepageURL(extension));
+ extension_data->SetBoolean("optionsOpenInTab",
+ OptionsPageInfo::ShouldOpenInTab(extension));
// Add dependent extensions.
base::ListValue* dependents_list = new base::ListValue;
@@ -892,10 +895,6 @@ void ExtensionSettingsHandler::HandleRequestExtensionsData(
->BlacklistedByDefault();
results.SetBoolean("loadUnpackedDisabled", load_unpacked_disabled);
- results.SetBoolean(
- "enableEmbeddedExtensionOptions",
- extensions::FeatureSwitch::embedded_extension_options()->IsEnabled());
-
web_ui()->CallJavascriptFunction(
"extensions.ExtensionSettings.returnExtensionsData", results);
@@ -1126,7 +1125,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()));

Powered by Google App Engine
This is Rietveld 408576698