Chromium Code Reviews| 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 b8ab0d4a66a37583a7a6017dad241355cc6a3d44..93993538b9b4a136e507c99e3cd25f085eb5f6f9 100644 |
| --- a/chrome/browser/resources/extensions/extension_list.js |
| +++ b/chrome/browser/resources/extensions/extension_list.js |
| @@ -567,20 +567,36 @@ cr.define('options', function() { |
| if (scroll) |
| this.scrollToNode_(extensionId); |
| + |
| + document.activeElement.blur(); |
| + |
| // Add the options query string. Corner case: the 'options' query string |
| // will clobber the 'id' query string if the options link is clicked when |
| // 'id' is in the URL, or if both query strings are in the URL. |
| uber.replaceState({}, '?options=' + extensionId); |
| - extensions.ExtensionOptionsOverlay.getInstance(). |
| - setExtensionAndShowOverlay(extensionId, |
| - extension.name, |
| - extension.icon); |
| + var shownCallback = function() { |
| + if (cr.ui.FocusOutlineManager.forDocument(document).visible) |
| + overlay.setInitialFocus(); |
| + }; |
| + var overlay = extensions.ExtensionOptionsOverlay.getInstance(); |
| + overlay.setExtensionAndShowOverlay(extensionId, extension.name, |
| + extension.icon, shownCallback); |
| this.optionsShown_ = true; |
| - $('overlay').addEventListener('cancelOverlay', function() { |
| - this.optionsShown_ = false; |
| - }.bind(this)); |
| + |
| + var self = this; |
| + $('overlay').addEventListener('cancelOverlay', function f() { |
| + // Restore initial focus once this page isn't rebuild crazy. |
| + // http://crbug.com/450818 |
| + self.optionsShown_ = false; |
| + $('overlay').removeEventListener('cancelOverlay', f); |
| + }); |
| + |
| + // TODO(dbeam): guestview's focus is weird. Only when this is called from |
| + // within this event handler *and* after the showing animation completes |
| + // does this work. |
| + shownCallback(); |
|
Dan Beam
2015/02/04 18:11:21
kalman@: ok with this?
|
| }, |
| }; |