MD Bookmarks: Restore any previously selected folder when clearing search

chrome/browser/resources/md_bookmarks/util.js

 // Copyright 2017 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.
 
 /**
  * @fileoverview Utility functions for the Bookmarks page.
  */
 
 cr.define('bookmarks.util', function() {
   /**
+   * Returns the list of bookmark IDs to be displayed in the UI, taking into
+   * account search and the currently selected folder.
    * @param {!BookmarksPageState} state
    * @return {!Array<string>}
    */
   function getDisplayedList(state) {
     if (!isShowingSearch(state))
-      return assert(state.nodes[assert(state.selectedFolder)].children);
+      return assert(state.nodes[state.selectedFolder].children);
 
     return state.search.results;
   }
 
   /**
    * @param {BookmarkTreeNode} treeNode
    * @return {BookmarkNode}
    */
   function normalizeNode(treeNode) {
     var node = Object.assign({}, treeNode);
@@ skipping 48 matching lines @@
       },
       selection: {
         items: new Set(),
         anchor: null,
       },
     };
   }
 
   /**
    * @param {BookmarksPageState} state
-   * @return boolean
+   * @return {boolean}
    */
   function isShowingSearch(state) {
-    return !state.selectedFolder;
+    return !!state.search.term && !state.search.inProgress;
   }
 
   /**
    * @param {string} id
    * @param {NodeList} nodes
    * @return {boolean}
    */
   function hasChildFolders(id, nodes) {
     var children = nodes[id].children;
     for (var i = 0; i < children.length; i++) {
@@ skipping 66 matching lines @@
     getDescendants: getDescendants,
     getDisplayedList: getDisplayedList,
     hasChildFolders: hasChildFolders,
     isShowingSearch: isShowingSearch,
     normalizeNode: normalizeNode,
     normalizeNodes: normalizeNodes,
     removeIdsFromMap: removeIdsFromMap,
     removeIdsFromSet: removeIdsFromSet,
   };
 });