| Index: chrome/browser/resources/media_router/elements/media_router_header/media_router_header.js
|
| diff --git a/chrome/browser/resources/media_router/elements/media_router_header/media_router_header.js b/chrome/browser/resources/media_router/elements/media_router_header/media_router_header.js
|
| index 9c712c6d095797ea49942fc200ddaa730606f301..a812562ea1baaa725b18faaaaa73a770007b6a81 100644
|
| --- a/chrome/browser/resources/media_router/elements/media_router_header/media_router_header.js
|
| +++ b/chrome/browser/resources/media_router/elements/media_router_header/media_router_header.js
|
| @@ -88,6 +88,14 @@ Polymer({
|
| 'focus': 'onFocus_',
|
| },
|
|
|
| + ready: function() {
|
| + // If this is not on a Mac platform, remove the placeholder. See
|
| + // onFocus_() for more details. ready() is only called once, so no need
|
| + // to check if the placeholder exist before removing.
|
| + if (!cr.isMac)
|
| + this.$$('#focus-placeholder').remove();
|
| + },
|
| +
|
| attached: function() {
|
| // isRTL() only works after i18n_template.js runs to set <html dir>.
|
| // Set the back button icon based on text direction.
|
| @@ -161,10 +169,18 @@ Polymer({
|
| */
|
| onFocus_: function(event) {
|
| // If the focus event was not triggered by the user, remove focus from
|
| - // the element. This prevents unexpected focusing such as when the dialog
|
| - // is initially loaded.
|
| - if (!event.sourceCapabilities)
|
| + // the element. This prevents unexpected focusing when the dialog is
|
| + // initially loaded.
|
| + // This only happens on mac.
|
| + if (cr.isMac && !event.sourceCapabilities) {
|
| event.path[0].blur();
|
| + // Adding a focus placeholder element is part of the workaround for
|
| + // handling unexpected focusing, which only happens once on dialog open.
|
| + // Since #focus-placeholder initially is focus-enabled, as denoted by
|
| + // its tabindex value, the focus will not appear in other elements.
|
| + // Remove the placeholder since we have no more use for it.
|
| + this.$$('#focus-placeholder').remove();
|
| + }
|
| },
|
|
|
| /**
|
|
|
Chromium Code Reviews
Issue 1820763003:
[Media Router WebUI] Handle on dialog load focus on Mac. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@2661