MD Bookmarks: Restore any previously selected folder when clearing search

chrome/browser/resources/md_bookmarks/folder_node.js

Index: chrome/browser/resources/md_bookmarks/folder_node.js
diff --git a/chrome/browser/resources/md_bookmarks/folder_node.js b/chrome/browser/resources/md_bookmarks/folder_node.js
index e9e204ef3011aa40469bf04103ba221b57f52418..2800bf00f1799e4faa9737c7eb5e0599db20114e 100644
--- a/chrome/browser/resources/md_bookmarks/folder_node.js
+++ b/chrome/browser/resources/md_bookmarks/folder_node.js
@@ -30,11 +30,14 @@ Polymer({
     selectedFolder_: String,
 
     /** @private */
+    searchActive_: Boolean,
+
+    /** @private */
     isSelectedFolder_: {
       type: Boolean,
       value: false,
       reflectToAttribute: true,
-      computed: 'computeIsSelected_(itemId, selectedFolder_)'
+      computed: 'computeIsSelected_(itemId, selectedFolder_, searchActive_)'
     },
   },
 
@@ -49,6 +52,9 @@ Polymer({
     this.watch('selectedFolder_', function(state) {
       return state.selectedFolder;
     });
+    this.watch('searchActive_', function(state) {
+      return bookmarks.util.isShowingSearch(state);
+    });
 
     this.updateFromStore();
   },
@@ -88,8 +94,8 @@ Polymer({
    * @param {string} selectedFolder
    * @return {boolean}
    */
-  computeIsSelected_: function(itemId, selectedFolder) {
-    return itemId == selectedFolder;
+  computeIsSelected_: function(itemId, selectedFolder, searchActive) {
+    return itemId == selectedFolder && !searchActive;
   },
 
   /**