Add the "options_ui" extension manifest field.

chrome/browser/ui/webui/extensions/extension_settings_handler.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h"
 
 #include "apps/app_load_service.h"
 #include "apps/saved_files_service.h"
 #include "base/auto_reset.h"
 #include "base/base64.h"
@@ skipping 74 matching lines @@
 #include "extensions/browser/view_type_utils.h"
 #include "extensions/browser/warning_set.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_icon_set.h"
 #include "extensions/common/extension_set.h"
 #include "extensions/common/feature_switch.h"
 #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"
 #include "ui/base/l10n/l10n_util.h"
 
 using base::DictionaryValue;
 using base::ListValue;
 using content::RenderViewHost;
 using content::WebContents;
 
@@ skipping 157 matching lines @@
                              extension->can_be_incognito_enabled());
   extension_data->SetBoolean("wantsFileAccess", extension->wants_file_access());
   extension_data->SetBoolean("allowFileAccess",
       util::AllowFileAccess(extension->id(), extension_service_->profile()));
   extension_data->SetBoolean("allow_reload",
       Manifest::IsUnpackedLocation(extension->location()));
   extension_data->SetBoolean("is_hosted_app", extension->is_hosted_app());
   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;
   if (extension->is_shared_module()) {
     scoped_ptr<ExtensionSet> dependent_extensions =
         extension_service_->shared_module_service()->GetDependentExtensions(
             extension);
     for (ExtensionSet::const_iterator i = dependent_extensions->begin();
          i != dependent_extensions->end();
          i++) {
@@ skipping 601 matching lines @@
                            ExtensionRegistry::EVERYTHING) &&
       !profile->GetPrefs()->GetBoolean(prefs::kExtensionsUIDismissedADTPromo)) {
     promote_apps_dev_tools = true;
   }
   results.SetBoolean("promoteAppsDevTools", promote_apps_dev_tools);
 
   bool load_unpacked_disabled =
       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);
 
   MaybeRegisterForNotifications();
   UMA_HISTOGRAM_BOOLEAN("ExtensionSettings.ShouldDoVerificationCheck",
                         should_do_verification_check_);
   if (should_do_verification_check_) {
     should_do_verification_check_ = false;
     ExtensionSystem::Get(Profile::FromWebUI(web_ui()))
         ->install_verifier()
@@ skipping 210 matching lines @@
     return;  // Only one prompt at a time.
 
   extension_id_prompting_ = extension_id;
 
   GetExtensionUninstallDialog()->ConfirmUninstall(extension);
 }
 
 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()));
 }
 
 void ExtensionSettingsHandler::HandlePermissionsMessage(
     const base::ListValue* args) {
   std::string extension_id(base::UTF16ToUTF8(ExtractStringValue(args)));
   CHECK(!extension_id.empty());
   const Extension* extension =
@@ skipping 275 matching lines @@
     extension_service_->EnableExtension(extension_id);
   } else {
     ExtensionErrorReporter::GetInstance()->ReportError(
         base::UTF8ToUTF16(JoinString(requirement_errors, ' ')),
         true);  // Be noisy.
   }
   requirements_checker_.reset();
 }
 
 }  // namespace extensions