| 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..030d1ca257cb65e4e59e0e19ebf5da7d71691ca5 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.
|
| @@ -80,13 +84,13 @@ Polymer({
|
| tab.windowId = windowId;
|
| });
|
|
|
| + var windowAdded = false;
|
| if (!this.searchTerm) {
|
| // Add all the tabs if there is no search term.
|
| tabs = tabs.concat(newTabs);
|
| - separatorIndexes.push(tabs.length - 1);
|
| + windowAdded = true;
|
| } else {
|
| var searchText = this.searchTerm.toLowerCase();
|
| - var windowAdded = false;
|
| for (var j = 0; j < newTabs.length; j++) {
|
| var tab = newTabs[j];
|
| if (tab.title.toLowerCase().indexOf(searchText) != -1) {
|
| @@ -94,10 +98,9 @@ Polymer({
|
| windowAdded = true;
|
| }
|
| }
|
| - if (windowAdded)
|
| - separatorIndexes.push(tabs.length - 1);
|
| }
|
| -
|
| + if (windowAdded && i != session.windows.length - 1)
|
| + separatorIndexes.push(tabs.length - 1);
|
| }
|
| return {
|
| device: session.name,
|
| @@ -109,12 +112,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_ = [];
|
|
|