| 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 eb953111821c6cae7bd0043e0b6097b8cb22702d..324c060378868342d2a1c76e27ee812c93d2bbc6 100644
|
| --- a/chrome/browser/resources/md_history/app.js
|
| +++ b/chrome/browser/resources/md_history/app.js
|
| @@ -6,6 +6,8 @@ Polymer({
|
| is: 'history-app',
|
|
|
| properties: {
|
| + showSidebarFooter: Boolean,
|
| +
|
| // The id of the currently selected page.
|
| selectedPage_: {type: String, value: 'history', observer: 'unselectAll'},
|
|
|
| @@ -50,6 +52,9 @@ Polymer({
|
|
|
| // The query params for the page.
|
| queryParams_: Object,
|
| +
|
| + // True if the window is narrow enough for the page to have a drawer.
|
| + hasDrawer_: Boolean,
|
| },
|
|
|
| observers: [
|
| @@ -70,6 +75,7 @@ Polymer({
|
| 'unselect-all': 'unselectAll',
|
| 'delete-selected': 'deleteSelected',
|
| 'search-domain': 'searchDomain_',
|
| + 'history-close-drawer': 'closeDrawer_',
|
| },
|
|
|
| /** @override */
|
| @@ -88,7 +94,11 @@ Polymer({
|
| },
|
|
|
| /** @private */
|
| - onMenuTap_: function() { this.$['side-bar'].toggle(); },
|
| + onMenuTap_: function() {
|
| + var drawer = this.$$('#drawer');
|
| + if (drawer)
|
| + drawer.toggle();
|
| + },
|
|
|
| /**
|
| * Listens for history-item being selected or deselected (through checkbox)
|
| @@ -101,13 +111,6 @@ Polymer({
|
| },
|
|
|
| /**
|
| - * @return {HistorySideBarElement} The side bar of this history app.
|
| - */
|
| - getSideBar: function() {
|
| - return this.$['side-bar'];
|
| - },
|
| -
|
| - /**
|
| * Listens for call to cancel selection and loops through all items to set
|
| * checkbox to be unselected.
|
| * @private
|
| @@ -163,6 +166,13 @@ Polymer({
|
| }
|
| },
|
|
|
| + /** @private */
|
| + onDrawerFocus_: function() {
|
| + var sideBar = this.$$('#drawer-side-bar');
|
| + if (sideBar)
|
| + sideBar.focusCurrentPage();
|
| + },
|
| +
|
| /**
|
| * @param {string} searchTerm
|
| * @private
|
| @@ -211,7 +221,8 @@ Polymer({
|
| var syncedDeviceManagerElem =
|
| /** @type {HistorySyncedDeviceManagerElement} */this
|
| .$$('history-synced-device-manager');
|
| - syncedDeviceManagerElem.updateSignInState(isUserSignedIn);
|
| + if (syncedDeviceManagerElem)
|
| + syncedDeviceManagerElem.updateSignInState(isUserSignedIn);
|
| },
|
|
|
| /**
|
| @@ -264,4 +275,11 @@ Polymer({
|
| getSelectedPage_(selectedPage, items) {
|
| return selectedPage;
|
| },
|
| +
|
| + /** @private */
|
| + closeDrawer_: function() {
|
| + var drawer = this.$$('#drawer');
|
| + if (drawer)
|
| + drawer.close();
|
| + },
|
| });
|
|
|