| Index: chrome/browser/resources/md_history/history.js
|
| diff --git a/chrome/browser/resources/md_history/history.js b/chrome/browser/resources/md_history/history.js
|
| index 50bf72dc96630f86982e1318afeacc0a29a81c23..c0ebda5511304a17c5f513776aeeb74aab7525a4 100644
|
| --- a/chrome/browser/resources/md_history/history.js
|
| +++ b/chrome/browser/resources/md_history/history.js
|
| @@ -12,10 +12,6 @@
|
| */
|
| var BROWSING_GAP_TIME = 15 * 60 * 1000;
|
|
|
| -window.addEventListener('load', function() {
|
| - chrome.send('queryHistory', ['', 0, 0, 0, RESULTS_PER_PAGE]);
|
| -});
|
| -
|
| /**
|
| * Listens for history-item being selected or deselected (through checkbox)
|
| * and changes the view of the top toolbar.
|
| @@ -67,6 +63,19 @@ window.addEventListener('resize', function() {
|
| $('history-list').closeMenu();
|
| });
|
|
|
| +/**
|
| + * Switches between displaying history data and synced tabs data for the page.
|
| + */
|
| +window.addEventListener('switch-display', function(e) {
|
| + $('synced-device-manager').hidden = e.detail.display != 'synced-tabs-button';
|
| + $('history-list').hidden = e.detail.display != 'history-button';
|
| +});
|
| +
|
| +window.addEventListener('load', function() {
|
| + chrome.send('queryHistory', ['', 0, 0, 0, RESULTS_PER_PAGE]);
|
| + chrome.send('getForeignSessions');
|
| +});
|
| +
|
| // Chrome Callbacks-------------------------------------------------------------
|
|
|
| /**
|
| @@ -79,6 +88,22 @@ function historyResult(info, results) {
|
| }
|
|
|
| /**
|
| + * Receives the synced history data. An empty list means that either there are
|
| + * no foreign sessions, or tab sync is disabled for this profile.
|
| + * |isTabSyncEnabled| makes it possible to distinguish between the cases.
|
| + *
|
| + * @param {Array} sessionList Array of objects describing the sessions
|
| + * from other devices.
|
| + * @param {boolean} isTabSyncEnabled Is tab sync enabled for this profile?
|
| + */
|
| +function setForeignSessions(sessionList, isTabSyncEnabled) {
|
| + $('side-bar').hidden = !isTabSyncEnabled;
|
| + if (isTabSyncEnabled) {
|
| + $('synced-device-manager').addSyncedHistory(sessionList);
|
| + }
|
| +}
|
| +
|
| +/**
|
| * Called by the history backend when deletion was succesful.
|
| */
|
| function deleteComplete() {
|
|
|