MD Bookmarks: Restore any previously selected folder when clearing search

chrome/browser/resources/md_bookmarks/folder_node.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: 'bookmarks-folder-node',
 
   behaviors: [
     bookmarks.StoreClient,
   ],
@@ skipping 12 matching lines @@
     /** @type {BookmarkNode} */
     item_: Object,
 
     /** @private */
     isClosed_: Boolean,
 
     /** @private */
     selectedFolder_: String,
 
     /** @private */
+    searchActive_: Boolean,
+
+    /** @private */
     isSelectedFolder_: {
       type: Boolean,
       value: false,
       reflectToAttribute: true,
-      computed: 'computeIsSelected_(itemId, selectedFolder_)'
+      computed: 'computeIsSelected_(itemId, selectedFolder_, searchActive_)'
     },
   },
 
   /** @override */
   attached: function() {
     this.watch('item_', function(state) {
       return state.nodes[this.itemId];
     }.bind(this));
     this.watch('isClosed_', function(state) {
       return state.closedFolders.has(this.itemId);
     }.bind(this));
     this.watch('selectedFolder_', function(state) {
       return state.selectedFolder;
     });
+    this.watch('searchActive_', function(state) {
+      return bookmarks.util.isShowingSearch(state);
+    });
 
     this.updateFromStore();
   },
 
   /** @return {HTMLElement} */
   getDropTarget: function() {
     return this.$.container;
   },
 
   /**
@@ skipping 19 matching lines @@
         bookmarks.actions.changeFolderOpen(this.item_.id, this.isClosed_));
     e.stopPropagation();
   },
 
   /**
    * @private
    * @param {string} itemId
    * @param {string} selectedFolder
    * @return {boolean}
    */
-  computeIsSelected_: function(itemId, selectedFolder) {
-    return itemId == selectedFolder;
+  computeIsSelected_: function(itemId, selectedFolder, searchActive) {
+    return itemId == selectedFolder && !searchActive;
   },
 
   /**
    * @private
    * @return {boolean}
    */
   hasChildFolder_: function() {
     return bookmarks.util.hasChildFolders(this.itemId, this.getState().nodes);
   },
 
@@ skipping 20 matching lines @@
   },
 
   /**
    * @private
    * @return {boolean}
    */
   isRootFolder_: function() {
     return this.depth == 0;
   },
 });