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..4a40daa66e85142ae2ac100b333b6bc0731ffe7a 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,11 +36,6 @@ cr.define('downloads', function() { |
}, |
/** @private */ |
- closeMoreActions_: function() { |
- this.$.more.close(); |
- }, |
- |
- /** @private */ |
downloadsShowingChanged_: function() { |
this.updateClearAll_(); |
}, |
@@ -54,31 +44,12 @@ cr.define('downloads', function() { |
onClearAllTap_: function() { |
assert(this.canClearAll()); |
downloads.ActionService.getInstance().clearAll(); |
+ this.$.moreActionsMenu.close(); |
}, |
/** @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.$.moreActionsMenu.showAt(this.$.moreActions); |
}, |
/** |
@@ -95,11 +66,12 @@ cr.define('downloads', function() { |
/** @private */ |
onOpenDownloadsFolderTap_: function() { |
downloads.ActionService.getInstance().openDownloadsFolder(); |
+ this.$.moreActionsMenu.close(); |
}, |
/** @private */ |
updateClearAll_: function() { |
- this.$$('paper-menu .clear-all').hidden = !this.canClearAll(); |
+ this.$$('.clear-all').hidden = !this.canClearAll(); |
}, |
}); |