Revert "Embedded Extension Options: remove flags and trunk channel restrictions"

extensions/common/switches.cc

 // Copyright 2013 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 "extensions/common/switches.h"
 
 namespace extensions {
 
 namespace switches {
 
 // Allows non-https URL for background_page for hosted apps.
 const char kAllowHTTPBackgroundPage[] = "allow-http-background-page";
 
 // Allows the browser to load extensions that lack a modern manifest when that
 // would otherwise be forbidden.
 const char kAllowLegacyExtensionManifests[] =
     "allow-legacy-extension-manifests";
 
 // Enables the <appview> tag in platform apps.
 const char kAppView[] = "app-view";
 
+// Enables extension options to be embedded in chrome://extensions rather than
+// a new tab.
+const char kEmbeddedExtensionOptions[] = "embedded-extension-options";
+
 // Show apps windows after the first paint. Windows will be shown significantly
 // later for heavy apps loading resources synchronously but it will be
 // insignificant for apps that load most of their resources asynchronously.
 const char kEnableAppsShowOnFirstPaint[] = "enable-apps-show-on-first-paint";
 
 // Hack so that feature switch can work with about_flags. See
 // kEnableScriptsRequireAction.
 const char kEnableAppView[] = "enable-app-view";
 
 // Enables the <window-controls> tag in platform apps.
 const char kEnableAppWindowControls[] = "enable-app-window-controls";
 
+// Hack so that feature switch can work with about_flags. See
+// kEnableScriptsRequireAction.
+const char kEnableEmbeddedExtensionOptions[] =
+    "enable-embedded-extension-options";
+
 // Enables extension APIs that are in development.
 const char kEnableExperimentalExtensionApis[] =
     "enable-experimental-extension-apis";
 
 // Hack so that feature switch can work with about_flags. See
 // kEnableScriptsRequireAction.
 const char kEnableExtensionActionRedesign[] =
     "enable-extension-action-redesign";
 
 // Hack so that feature switch can work with about_flags. See
@@ skipping 46 matching lines @@
 // Makes component extensions appear in chrome://settings/extensions.
 const char kShowComponentExtensionOptions[] =
     "show-component-extension-options";
 
 // Adds the given extension ID to all the permission whitelists.
 const char kWhitelistedExtensionID[] = "whitelisted-extension-id";
 
 }  // namespace switches
 
 }  // namespace extensions