MD Bookmarks: Remove '/?id=1' from URL when displaying Bookmarks Bar

chrome/browser/resources/md_bookmarks/router.js

Index: chrome/browser/resources/md_bookmarks/router.js
diff --git a/chrome/browser/resources/md_bookmarks/router.js b/chrome/browser/resources/md_bookmarks/router.js
index 2634fb32157b391a9bdafe884a755c145204af6e..431331e62b1347f226b6d69941be5084223ba378 100644
--- a/chrome/browser/resources/md_bookmarks/router.js
+++ b/chrome/browser/resources/md_bookmarks/router.js
@@ -23,15 +23,17 @@ Polymer({
     queryParams_: Object,
 
     /** @private */
-    searchTerm_: String,
+    searchTerm_: {
+      type: String,
+      value: '',
+    },
 
     /** @private {?string} */
     selectedId_: String,
   },
 
   observers: [
-    'onQueryChanged_(queryParams_.q)',
-    'onFolderChanged_(queryParams_.id)',
+    'onQueryParamsChanged_(queryParams_)',
     'onStateChanged_(searchTerm_, selectedId_)',
   ],
 
@@ -46,17 +48,17 @@ Polymer({
   },
 
   /** @private */
-  onQueryChanged_: function() {
+  onQueryParamsChanged_: function() {
     var searchTerm = this.queryParams_.q || '';
-    if (searchTerm && searchTerm != this.searchTerm_) {
+    var selectedId = this.queryParams_.id;
+    if (!selectedId && !searchTerm)
+      selectedId = BOOKMARKS_BAR_ID;
+
+    if (searchTerm != this.searchTerm_) {
       this.searchTerm_ = searchTerm;
       this.dispatch(bookmarks.actions.setSearchTerm(searchTerm));
     }
-  },
 
-  /** @private */
-  onFolderChanged_: function() {
-    var selectedId = this.queryParams_.id;
     if (selectedId && selectedId != this.selectedId_) {
       this.selectedId_ = selectedId;
       // Need to dispatch a deferred action so that during page load
@@ -77,7 +79,9 @@ Polymer({
   updateQueryParams_: function() {
     if (this.searchTerm_)
       this.queryParams_ = {q: this.searchTerm_};
-    else
+    else if (this.selectedId_ != BOOKMARKS_BAR_ID)
       this.queryParams_ = {id: this.selectedId_};
+    else
+      this.queryParams_ = {};
   },
 });