Chromium Code Reviews| Index: chrome/browser/resources/md_history/synced_device_manager.js |
| diff --git a/chrome/browser/resources/md_history/synced_device_manager.js b/chrome/browser/resources/md_history/synced_device_manager.js |
| index 6dd7f7881bc2bb6b6a4acfffe6ed9d24b49dd500..fba921895511d8bc761410e722eb272f4ad9670c 100644 |
| --- a/chrome/browser/resources/md_history/synced_device_manager.js |
| +++ b/chrome/browser/resources/md_history/synced_device_manager.js |
| @@ -48,12 +48,18 @@ Polymer({ |
| value: false, |
| }, |
| + /** @private */ |
| hasSeenForeignData_: Boolean, |
| + |
| + /** |
| + * The session ID referring to the currently active action menu. |
| + * @private {?string} |
| + */ |
| + actionMenuModel_: String, |
| }, |
| listeners: { |
| - 'toggle-menu': 'onToggleMenu_', |
| - 'scroll': 'onListScroll_', |
| + 'open-menu': 'onOpenMenu_', |
| 'update-focus-grid': 'updateFocusGrid_', |
| }, |
| @@ -128,21 +134,13 @@ Polymer({ |
| onSignInTap_: function() { chrome.send('startSignInFlow'); }, |
| /** @private */ |
| - onListScroll_: function() { |
| - var menu = this.$.menu.getIfExists(); |
| - if (menu) |
| - menu.closeMenu(); |
| - }, |
| - |
| - /** @private */ |
| - onToggleMenu_: function(e) { |
| + onOpenMenu_: function(e) { |
| var menu = /** @type {CrSharedMenuElement} */ this.$.menu.get(); |
|
tsergeant
2016/12/21 00:39:36
CrActionMenuElement, now
(it's weird that closure
dpapad
2016/12/21 01:04:48
Done, and yes, something is fishy. Closure should
|
| - menu.toggleMenu(e.detail.target, e.detail.tag); |
| - if (menu.menuOpen) { |
| - md_history.BrowserService.getInstance().recordHistogram( |
| - SYNCED_TABS_HISTOGRAM_NAME, SyncedTabsHistogram.SHOW_SESSION_MENU, |
| - SyncedTabsHistogram.LIMIT); |
| - } |
| + this.actionMenuModel_ = e.detail.tag; |
| + menu.showAt(e.detail.target); |
| + md_history.BrowserService.getInstance().recordHistogram( |
| + SYNCED_TABS_HISTOGRAM_NAME, SyncedTabsHistogram.SHOW_SESSION_MENU, |
| + SyncedTabsHistogram.LIMIT); |
| }, |
| /** @private */ |
| @@ -152,9 +150,9 @@ Polymer({ |
| browserService.recordHistogram( |
| SYNCED_TABS_HISTOGRAM_NAME, SyncedTabsHistogram.OPEN_ALL, |
| SyncedTabsHistogram.LIMIT); |
| - browserService.openForeignSessionAllTabs( |
| - menu.itemData); |
| - menu.closeMenu(); |
| + browserService.openForeignSessionAllTabs(assert(this.actionMenuModel_)); |
| + this.actionMenuModel_ = null; |
| + menu.close(); |
| }, |
| /** @private */ |
| @@ -184,8 +182,9 @@ Polymer({ |
| browserService.recordHistogram( |
| SYNCED_TABS_HISTOGRAM_NAME, SyncedTabsHistogram.HIDE_FOR_NOW, |
| SyncedTabsHistogram.LIMIT); |
| - browserService.deleteForeignSession(menu.itemData); |
| - menu.closeMenu(); |
| + browserService.deleteForeignSession(assert(this.actionMenuModel_)); |
| + this.actionMenuModel_ = null; |
| + menu.close(); |
| }, |
| /** @private */ |