Chromium Code Reviews| Index: chrome/browser/resources/md_downloads/toolbar.js |
| diff --git a/chrome/browser/resources/md_downloads/toolbar.js b/chrome/browser/resources/md_downloads/toolbar.js |
| index 726f3a4e82a6893ca0d8f05f9729b6b1e801f684..f3746e9dc0d0efc75b6b118a70a1041107eeee89 100644 |
| --- a/chrome/browser/resources/md_downloads/toolbar.js |
| +++ b/chrome/browser/resources/md_downloads/toolbar.js |
| @@ -20,11 +20,6 @@ cr.define('downloads', function() { |
| }, |
| }, |
| - listeners: { |
| - 'paper-dropdown-close': 'onPaperDropdownClose_', |
| - 'paper-dropdown-open': 'onPaperDropdownOpen_', |
| - }, |
| - |
| /** @return {boolean} Whether removal can be undone. */ |
| canUndo: function() { |
| return !this.$.toolbar.getSearchField().isSearchFocused(); |
| @@ -41,8 +36,8 @@ cr.define('downloads', function() { |
| }, |
| /** @private */ |
| - closeMoreActions_: function() { |
| - this.$.more.close(); |
| + closeActionMenu_: function() { |
| + this.$$('[is=cr-action-menu]').close(); |
|
dpapad
2017/01/25 01:01:45
Nit: Perhaps make the selector more specific (same
Dan Beam
2017/01/25 01:46:26
Done.
|
| }, |
| /** @private */ |
| @@ -54,31 +49,12 @@ cr.define('downloads', function() { |
| onClearAllTap_: function() { |
| assert(this.canClearAll()); |
| downloads.ActionService.getInstance().clearAll(); |
| + this.closeActionMenu_(); |
| }, |
| /** @private */ |
| - onPaperDropdownClose_: function() { |
| - window.removeEventListener('resize', assert(this.boundClose_)); |
| - }, |
| - |
| - /** |
| - * @param {!Event} e |
| - * @private |
| - */ |
| - onItemBlur_: function(e) { |
| - var menu = /** @type {PaperMenuElement} */(this.$$('paper-menu')); |
| - if (menu.items.indexOf(e.relatedTarget) >= 0) |
| - return; |
| - |
| - this.$.more.restoreFocusOnClose = false; |
| - this.closeMoreActions_(); |
| - this.$.more.restoreFocusOnClose = true; |
| - }, |
| - |
| - /** @private */ |
| - onPaperDropdownOpen_: function() { |
| - this.boundClose_ = this.boundClose_ || this.closeMoreActions_.bind(this); |
| - window.addEventListener('resize', this.boundClose_); |
| + onMoreActionsTap_: function() { |
| + this.$$('[is=cr-action-menu]').showAt(this.$.moreActions); |
| }, |
| /** |
| @@ -95,11 +71,12 @@ cr.define('downloads', function() { |
| /** @private */ |
| onOpenDownloadsFolderTap_: function() { |
| downloads.ActionService.getInstance().openDownloadsFolder(); |
| + this.closeActionMenu_(); |
| }, |
| /** @private */ |
| updateClearAll_: function() { |
| - this.$$('paper-menu .clear-all').hidden = !this.canClearAll(); |
| + this.$$('.clear-all').hidden = !this.canClearAll(); |
| }, |
| }); |