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 433fb7f88a5487479147853bbbf669a99f3ef12d..6daab5d137ec26bff66eaa530b73dfe163e9fe6c 100644 |
| --- a/chrome/browser/resources/md_history/synced_device_manager.js |
| +++ b/chrome/browser/resources/md_history/synced_device_manager.js |
| @@ -57,6 +57,10 @@ Polymer({ |
| } |
| }, |
| + listeners: { |
| + 'toggle-menu': 'onToggleMenu_', |
| + }, |
| + |
| /** @override */ |
| attached: function() { |
| // Update the sign in state. |
| @@ -83,7 +87,8 @@ Polymer({ |
| if (!this.searchTerm) { |
| // Add all the tabs if there is no search term. |
| tabs = tabs.concat(newTabs); |
| - separatorIndexes.push(tabs.length - 1); |
| + if (i != session.windows.length - 1) |
| + separatorIndexes.push(tabs.length - 1); |
| } else { |
| var searchText = this.searchTerm.toLowerCase(); |
| var windowAdded = false; |
| @@ -94,7 +99,7 @@ Polymer({ |
| windowAdded = true; |
| } |
| } |
| - if (windowAdded) |
| + if (windowAdded && i != session.windows.length - 1) |
| separatorIndexes.push(tabs.length - 1); |
|
calamity
2016/08/04 07:30:05
Move this outside the if-else and move windowAdded
tsergeant
2016/08/05 02:40:02
Done.
|
| } |
| @@ -109,12 +114,27 @@ Polymer({ |
| }; |
| }, |
| - |
| onSignInTap_: function() { |
| chrome.send('SyncSetupShowSetupUI'); |
| chrome.send('SyncSetupStartSignIn', [false]); |
| }, |
| + onToggleMenu_: function(e) { |
| + this.$.menu.toggleMenu(e.detail.target, e.detail.tag); |
| + }, |
| + |
| + onOpenAllTap_: function() { |
| + md_history.BrowserService.getInstance().openForeignSessionAllTabs( |
| + this.$.menu.itemData); |
| + this.$.menu.closeMenu(); |
| + }, |
| + |
| + onDeleteSessionTap_: function() { |
| + md_history.BrowserService.getInstance().deleteForeignSession( |
| + this.$.menu.itemData); |
| + this.$.menu.closeMenu(); |
| + }, |
| + |
| /** @private */ |
| clearDisplayedSyncedDevices_: function() { |
| this.syncedDevices_ = []; |