MD History: Move queryState to be managed by history-router

chrome/browser/resources/md_history/list_container.js

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 Polymer({
   is: 'history-list-container',
 
   properties: {
     /** @type {HistoryRange} */
     groupedRange: {
       type: Number,
       observer: 'groupedRangeChanged_',
     },
 
     // The path of the currently selected page.
-    selectedPage_: String,
+    selectedPage_: {
+      type: String,
+      computed: 'computeSelectedPage_(groupedRange)',
+    },
 
     // Whether domain-grouped history is enabled.
     grouped: Boolean,
 
     /** @type {!QueryState} */
     queryState: Object,
 
     /** @type {!QueryResult} */
     queryResult: Object,
 
     /**
      * @private {?{
      *   index: number,
      *   item: !HistoryEntry,
      *   path: string,
      *   target: !HTMLElement
      * }}
      */
     actionMenuModel_: Object,
   },
 
   observers: [
-    'searchTermChanged_(queryState.searchTerm)',
-    'groupedOffsetChanged_(queryState.groupedOffset)',
+    'groupedRangeChanged_(queryState.range)',
   ],
 
   listeners: {
-    'load-more-history': 'loadMoreHistory_',
     'open-menu': 'openMenu_',
   },
 
   /**
    * @param {HistoryQuery} info An object containing information about the
    *    query.
    * @param {!Array<!HistoryEntry>} results A list of results.
    */
   historyResult: function(info, results) {
     this.initializeResults_(info, results);
     this.closeMenu_();
 
     if (info.term && !this.queryState.incremental) {
       Polymer.IronA11yAnnouncer.requestAvailability();
       this.fire('iron-announce', {
         text:
             md_history.HistoryItem.searchResultsTitle(results.length, info.term)
       });
     }
 
     var list = /** @type {HistoryListBehavior} */ this.getSelectedList_();
     list.addNewResults(results, this.queryState.incremental, info.finished);
   },
 
-  /**
-   * Queries the history backend for results based on queryState.
-   * @param {boolean} incremental Whether the new query should continue where
-   *    the previous query stopped.
-   */
-  queryHistory: function(incremental) {
-    var queryState = this.queryState;
-    // Disable querying until the first set of results have been returned. If
-    // there is a search, query immediately to support search query params from
-    // the URL.
-    var noResults = !this.queryResult || this.queryResult.results == null;
-    if (queryState.queryingDisabled ||
-        (!this.queryState.searchTerm && noResults)) {
-      return;
-    }
-
-    // Close any open dialog if a new query is initiated.
-    var dialog = this.$.dialog.getIfExists();
-    if (!incremental && dialog && dialog.open)
-      dialog.close();
-
-    this.set('queryState.querying', true);
-    this.set('queryState.incremental', incremental);
-
-    var lastVisitTime = 0;
-    if (incremental) {
-      var lastVisit = this.queryResult.results.slice(-1)[0];
-      lastVisitTime = lastVisit ? Math.floor(lastVisit.time) : 0;
-    }
-
-    var maxResults =
-        this.groupedRange == HistoryRange.ALL_TIME ? RESULTS_PER_PAGE : 0;
-    chrome.send('queryHistory', [
-      queryState.searchTerm, queryState.groupedOffset, queryState.range,
-      lastVisitTime, maxResults
-    ]);
-  },
-
   historyDeleted: function() {
     // Do not reload the list when there are items checked.
     if (this.getSelectedItemCount() > 0)
       return;
 
     // Reload the list with current search state.
-    this.queryHistory(false);
+    this.fire('query-history', false);
   },
 
   /** @return {Element} */
   getContentScrollTarget: function() {
     return this.getSelectedList_();
   },
 
   /** @return {number} */
   getSelectedItemCount: function() {
     return this.getSelectedList_().selectedPaths.size;
@@ skipping 18 matching lines @@
     if (this.queryState.searchTerm != '')
       browserService.recordAction('SearchResultRemove');
     this.$.dialog.get().showModal();
 
     // TODO(dbeam): remove focus flicker caused by showModal() + focus().
     this.$$('.action-button').focus();
   },
 
   /**
    * @param {HistoryRange} range
+   * @return {string}
+   * @private
+   */
+  computeSelectedPage_: function(range) {
+    return range == HistoryRange.ALL_TIME ? 'infinite-list' : 'grouped-list';
+  },
+
+  /**
+   * @param {HistoryRange} range
    * @private
    */
-  groupedRangeChanged_: function(range, oldRange) {
-    this.selectedPage_ =
-        range == HistoryRange.ALL_TIME ? 'infinite-list' : 'grouped-list';
-
-    if (oldRange == undefined)
-      return;
-
-    this.set('queryState.groupedOffset', 0);
-
+  groupedRangeChanged_: function(range) {
     // Reset the results on range change to prevent stale results from being
     // processed into the incoming range's UI.
-    if (this.queryResult.info) {
+    if (range != HistoryRange.ALL_TIME && this.queryResult.info) {
       this.set('queryResult.results', []);
       this.historyResult(this.queryResult.info, []);
     }
-
-    this.queryHistory(false);
-    this.fire('history-view-changed');
-  },
-
-  /** @private */
-  searchTermChanged_: function() {
-    this.queryHistory(false);
-    // TODO(tsergeant): Ignore incremental searches in this metric.
-    if (this.queryState.searchTerm)
-      md_history.BrowserService.getInstance().recordAction('Search');
-  },
-
-  /** @private */
-  groupedOffsetChanged_: function() {
-    this.queryHistory(false);
-  },
-
-  /** @private */
-  loadMoreHistory_: function() {
-    this.queryHistory(true);
   },
 
   /**
    * @param {HistoryQuery} info
    * @param {!Array<HistoryEntry>} results
    * @private
    */
   initializeResults_: function(info, results) {
     if (results.length == 0)
       return;
@@ skipping 107 matching lines @@
    */
   getSelectedList_: function() {
     return this.$$('#' + this.selectedPage_);
   },
 
   /** @private */
   canDeleteHistory_: function() {
     return loadTimeData.getBoolean('allowDeletingHistory');
   }
 });