| Index: chrome/browser/resources/md_history/app.js
|
| diff --git a/chrome/browser/resources/md_history/app.js b/chrome/browser/resources/md_history/app.js
|
| index 205cae2d4611a1ced164d0339653a0b06a704711..40b790e308017c4d9c6806bd5fd327da9881e756 100644
|
| --- a/chrome/browser/resources/md_history/app.js
|
| +++ b/chrome/browser/resources/md_history/app.js
|
| @@ -44,8 +44,18 @@ Polymer({
|
| };
|
| }
|
| },
|
| +
|
| + // Route data for the current page.
|
| + routeData_: Object,
|
| },
|
|
|
| + observers: [
|
| + // routeData_.page <=> selectedPage
|
| + 'routeDataChanged_(routeData_.page)',
|
| + 'selectedPageChanged_(selectedPage_)',
|
| + ],
|
| +
|
| + // TODO(calamity): Replace these event listeners with data bound properties.
|
| listeners: {
|
| 'cr-menu-tap': 'onMenuTap_',
|
| 'history-checkbox-select': 'checkboxSelected',
|
| @@ -166,7 +176,7 @@ Polymer({
|
| * @private
|
| */
|
| syncedTabsSelected_: function(selectedPage) {
|
| - return selectedPage == 'synced-devices';
|
| + return selectedPage == 'syncedTabs';
|
| },
|
|
|
| /**
|
| @@ -180,4 +190,34 @@ Polymer({
|
| shouldShowSpinner_: function(querying, incremental, searchTerm) {
|
| return querying && !incremental && searchTerm != '';
|
| },
|
| +
|
| + /**
|
| + * @param {string} page
|
| + * @private
|
| + */
|
| + routeDataChanged_: function(page) {
|
| + this.selectedPage_ = page;
|
| + },
|
| +
|
| + /**
|
| + * @param {string} selectedPage
|
| + * @private
|
| + */
|
| + selectedPageChanged_: function(selectedPage) {
|
| + this.set('routeData_.page', selectedPage);
|
| + },
|
| +
|
| + /**
|
| + * This computed binding is needed to make the iron-pages selector update when
|
| + * the synced-device-manager is instantiated for the first time. Otherwise the
|
| + * fallback selection will continue to be used after the corresponding item is
|
| + * added as a child of iron-pages.
|
| + * @param {string} selectedPage
|
| + * @param {Array} items
|
| + * @return {string}
|
| + * @private
|
| + */
|
| + getSelectedPage_(selectedPage, items) {
|
| + return selectedPage;
|
| + },
|
| });
|
|
|