Display extension options in a WebUI overlay instead of in a new tab

chrome/browser/resources/extensions/extension_list.js

 // 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 src="extension_error.js">
 
 cr.define('options', function() {
   'use strict';
 
   /**
@@ skipping 175 matching lines @@
                       [extension.id, String(e.target.checked)]);
         });
         fileAccess.querySelector('input').checked = extension.allowFileAccess;
         fileAccess.hidden = false;
       }
 
       // The 'Options' link.
       if (extension.enabled && extension.optionsUrl) {
         var options = node.querySelector('.options-link');
         options.addEventListener('click', function(e) {
-          chrome.send('extensionSettingsOptions', [extension.id]);
+          chrome.commandLinePrivate.hasSwitch(
+              'enable-embedded-extension-options',
+               function(result) {
+            if (result) {
+              extensions.ExtensionOptionsOverlay.getInstance().
+                  setExtensionAndShowOverlay([extension.id], extension.name);
+            } else {
+              chrome.send('extensionSettingsOptions', [extension.id]);
+            }
+          });
           e.preventDefault();
         });
         options.hidden = false;
       }
 
       // The 'Permissions' link.
       var permissions = node.querySelector('.permissions-link');
       permissions.addEventListener('click', function(e) {
         chrome.send('extensionSettingsPermissions', [extension.id]);
         e.preventDefault();
@@ skipping 199 matching lines @@
           topScroll -= pad / 2;
         setScrollTopForDocument(document, topScroll);
       }
     },
   };
 
   return {
     ExtensionsList: ExtensionsList
   };
 });