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

extensions/common/switches.cc

Index: extensions/common/switches.cc
diff --git a/extensions/common/switches.cc b/extensions/common/switches.cc
index fff3348d06fcf349ef871b73614b46d1644658cf..e55ca4814159cfb3330ca22150f3e4fd129f04bb 100644
--- a/extensions/common/switches.cc
+++ b/extensions/common/switches.cc
@@ -19,6 +19,10 @@ const char kAllowLegacyExtensionManifests[] =
 // 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.
@@ -31,6 +35,11 @@ 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";