Open embedded extension options from the extension action context menu

chrome/browser/extensions/extension_tab_util.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/extensions/extension_tab_util.h"
 
 #include "apps/app_window.h"
 #include "apps/app_window_registry.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/extensions/api/tabs/tabs_constants.h"
@@ skipping 13 matching lines @@
 #include "chrome/common/extensions/api/tabs.h"
 #include "chrome/common/extensions/manifest_url_handler.h"
 #include "chrome/common/url_constants.h"
 #include "components/url_fixer/url_fixer.h"
 #include "content/public/browser/favicon_status.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/error_utils.h"
 #include "extensions/common/extension.h"
+#include "extensions/common/feature_switch.h"
 #include "extensions/common/manifest_constants.h"
 #include "extensions/common/manifest_handlers/incognito_info.h"
 #include "extensions/common/permissions/api_permission.h"
 #include "extensions/common/permissions/permissions_data.h"
 #include "url/gurl.h"
 
 using apps::AppWindow;
 using content::NavigationEntry;
 using content::WebContents;
 
@@ skipping 515 matching lines @@
   // Force the options page to open in non-OTR window, because it won't be
   // able to save settings from OTR.
   scoped_ptr<chrome::ScopedTabbedBrowserDisplayer> displayer;
   if (browser->profile()->IsOffTheRecord()) {
     displayer.reset(new chrome::ScopedTabbedBrowserDisplayer(
         browser->profile()->GetOriginalProfile(),
         browser->host_desktop_type()));
     browser = displayer->browser();
   }
 
-  content::OpenURLParams params(ManifestURL::GetOptionsPage(extension),
+  GURL options_url;
+  if (extensions::FeatureSwitch::embedded_extension_options()->IsEnabled()) {

[Devlin, 2014/08/19 22:20:41]

Maybe a quick comment to say what the implications of all this are.

[Devlin, 2014/08/19 22:20:41]

no extensions::

[ericzeng, 2014/08/19 22:47:51]

Done.

+    options_url = GURL(chrome::kChromeUIExtensionsURL);
+    if (!extension->id().empty()) {
+      GURL::Replacements replacements;
+      std::string query("options=");
+      query += extension->id();

[Devlin, 2014/08/19 22:20:41]

use StringPrintf here:
std::string query = base::StringPrintf("options=%s", extension->id().c_str());

[ericzeng, 2014/08/19 22:47:51]

Done.

+      replacements.SetQueryStr(query);
+      options_url = options_url.ReplaceComponents(replacements);
+    }
+  } else {
+    options_url = ManifestURL::GetOptionsPage(extension);
+  }
+
+  content::OpenURLParams params(options_url,
                                 content::Referrer(),
                                 SINGLETON_TAB,
                                 content::PAGE_TRANSITION_LINK,
                                 false);
   browser->OpenURL(params);
   browser->window()->Show();
   WebContents* web_contents =
       browser->tab_strip_model()->GetActiveWebContents();
   web_contents->GetDelegate()->ActivateContents(web_contents);
 }
 
 }  // namespace extensions