Add the "options_ui" extension manifest field.

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 "base/strings/stringprintf.h"
 #include "chrome/browser/extensions/api/tabs/tabs_constants.h"
 #include "chrome/browser/extensions/chrome_extension_function.h"
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/extensions/window_controller.h"
 #include "chrome/browser/extensions/window_controller_list.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/session_tab_helper.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_iterator.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
 #include "chrome/browser/ui/singleton_tabs.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_iterator.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #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/manifest_handlers/options_page_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;
 
 namespace extensions {
 
@@ skipping 501 matching lines @@
     const WebContents* web_contents) {
   Browser* browser = chrome::FindBrowserWithWebContents(web_contents);
   if (browser != NULL)
     return browser->extension_window_controller();
 
   return NULL;
 }
 
 void ExtensionTabUtil::OpenOptionsPage(const Extension* extension,
                                        Browser* browser) {
-  DCHECK(!ManifestURL::GetOptionsPage(extension).is_empty());
+  DCHECK(!OptionsPageInfo::GetOptionsPage(extension).is_empty());

[not at google - send to devlin, 2014/08/29 05:39:23]

At this point I realise there should be an OptionsPageInfo::HasOptionsPage
method. Dunno, up to you if you want to do that cleanup, I think it'd be nice.

[ericzeng, 2014/08/29 22:08:49]

Done.

 
   // 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();
   }
 
-  if (FeatureSwitch::embedded_extension_options()->IsEnabled()) {
+  if (FeatureSwitch::embedded_extension_options()->IsEnabled() &&
+      !OptionsPageInfo::OpenInTab(extension)) {
     // If embedded extension options are enabled, open chrome://extensions
     // in a new tab and show the extension options in an embedded popup.
     chrome::NavigateParams params(chrome::GetSingletonTabNavigateParams(
         browser, GURL(chrome::kChromeUIExtensionsURL)));
     params.path_behavior = chrome::NavigateParams::IGNORE_AND_NAVIGATE;
 
     GURL::Replacements replacements;
     std::string query =
         base::StringPrintf("options=%s", extension->id().c_str());
     replacements.SetQueryStr(query);
     params.url = params.url.ReplaceComponents(replacements);
 
     chrome::ShowSingletonTabOverwritingNTP(browser, params);
   } else {
     // Otherwise open a new tab with the extension's options page
-    content::OpenURLParams params(ManifestURL::GetOptionsPage(extension),
+    content::OpenURLParams params(OptionsPageInfo::GetOptionsPage(extension),
                                   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