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 9ad9f03ba38b828c75e935b8105c35e59ad23721..531d2c3bb92c7b77b4290817aab8ad64cf65a19b 100644 |
--- a/chrome/browser/resources/md_history/app.js |
+++ b/chrome/browser/resources/md_history/app.js |
@@ -64,7 +64,10 @@ Polymer({ |
'routeDataChanged_(routeData.page)', |
'selectedPageChanged_(selectedPage_)', |
+ // route.__queryParams.q <=> queryState.searchTerm |
'searchTermChanged_(queryState_.searchTerm)', |
+ 'searchQueryParamChanged_(route.__queryParams.q)', |
tsergeant
2016/06/16 02:00:15
app-route exposes a `queryParams` property. You sh
calamity
2016/06/16 06:49:14
Ugh! So _that's_ where that was. I was so confused
|
+ |
'groupedRangeChanged_(queryState_.range)', |
], |
@@ -80,6 +83,10 @@ Polymer({ |
/** @override */ |
ready: function() { |
this.grouped_ = loadTimeData.getBoolean('groupByDomain'); |
+ if (window.location.hash) { |
+ window.location.href = window.location.href.split('#')[0] + '?' + |
+ window.location.hash.substr(1); |
+ } |
}, |
/** |
@@ -177,6 +184,11 @@ Polymer({ |
searchTermChanged_: function(searchTerm) { |
this.queryHistory(false); |
+ this.set('route.__queryParams.q', searchTerm || null); |
+ }, |
+ |
+ searchQueryParamChanged_: function(searchTerm) { |
+ this.$.toolbar.setSearchTerm(searchTerm || ''); |
}, |
groupedRangeChanged_: function(range) { |