Index: chrome/browser/resources/extensions/extension_list.js |
diff --git a/chrome/browser/resources/extensions/extension_list.js b/chrome/browser/resources/extensions/extension_list.js |
index 7067da5d00362dd398a95e914e17ca357a3a74ea..8e830a683d05df332aa85eec056675020ae331e7 100644 |
--- a/chrome/browser/resources/extensions/extension_list.js |
+++ b/chrome/browser/resources/extensions/extension_list.js |
@@ -193,7 +193,15 @@ cr.define('options', function() { |
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; |