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

extensions/common/manifest_handlers/options_page_info.cc

 // Copyright 2014 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/manifest_handlers/options_page_info.h"
 
 #include "base/files/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/utf_string_conversions.h"
 #include "extensions/common/api/extensions_manifest_types.h"
@@ skipping 94 matching lines @@
 }
 
 scoped_ptr<OptionsPageInfo> OptionsPageInfo::Create(
     Extension* extension,
     const base::Value* options_ui_value,
     const std::string& options_page_string,
     std::vector<InstallWarning>* install_warnings,
     base::string16* error) {
   GURL options_page;
   bool chrome_style = false;
-  bool open_in_tab = false;
+  bool open_in_tab = !FeatureSwitch::embedded_extension_options()->IsEnabled();
 
   // Parse the options_ui object.
-  if (options_ui_value) {
+  if (options_ui_value &&
+      FeatureSwitch::embedded_extension_options()->IsEnabled()) {
     base::string16 options_ui_error;
 
     scoped_ptr<OptionsUI> options_ui =
         OptionsUI::FromValue(*options_ui_value, &options_ui_error);
     if (!options_ui_error.empty()) {
       // OptionsUI::FromValue populates |error| both when there are
       // errors (in which case |options_ui| will be NULL) and warnings
       // (in which case |options_ui| will be valid). Either way, show it
       // as an install warning.
       install_warnings->push_back(
@@ skipping 87 matching lines @@
   }
   return true;
 }
 
 const std::vector<std::string> OptionsPageManifestHandler::Keys() const {
   static const char* keys[] = {keys::kOptionsPage, keys::kOptionsUI};
   return std::vector<std::string>(keys, keys + arraysize(keys));
 }
 
 }  // namespace extensions