Mac bookmark mgr: Restore previously selected group when search field is cleared.

chrome/browser/cocoa/bookmark_manager_controller.mm

 // Copyright (c) 2009 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.
 
 #import "chrome/browser/cocoa/bookmark_manager_controller.h"
 
 #include "app/l10n_util_mac.h"
 #include "app/resource_bundle.h"
 #include "base/logging.h"
 #include "base/mac_util.h"
@@ skipping 273 matching lines @@
 - (void)remapItem:(BookmarkItem*)item forNode:(const BookmarkNode*)node {
   NSMapInsert(nodeMap_, node, item);
 }
 
 // Removes a BookmarkNode from the node<->item mapping table.
 - (void)forgetNode:(const BookmarkNode*)node {
   NSMapRemove(nodeMap_, node);
   for (int i = node->GetChildCount() - 1 ; i >= 0 ; i--) {
     [self forgetNode:node->GetChild(i)];
   }
+
+  if (node == [preSearchGroup_ node])
+    preSearchGroup_.reset();
 }
 
 // Called when the bookmark model changes; forwards to the sub-controllers.
 - (void)itemChanged:(BookmarkItem*)item
     childrenChanged:(BOOL)childrenChanged {
   if (item) {
     [item nodeChanged];
     [groupsController_ itemChanged:item childrenChanged:childrenChanged];
     [listController_ itemChanged:item childrenChanged:childrenChanged];
   }
@@ skipping 103 matching lines @@
 - (void)showGroup:(BookmarkItem*)group {
   [groupsController_ revealItem:group];
 }
 
 // Makes an item visible and selects it.
 - (BOOL)revealItem:(BookmarkItem*)item {
   return [groupsController_ revealItem:[item parent]] &&
       [listController_ revealItem:item];
 }
 
-// Called when the user types into the search field.
+// Shows/hides the "Search Results" item.
+- (void)setSearchGroupVisible:(BOOL)visible {
+  NSMutableArray* rootItems = [NSMutableArray arrayWithArray:[root_ children]];
+  if (visible != [rootItems containsObject:searchGroup_]) {
+    if (visible) {
+      [rootItems addObject:searchGroup_];
+    } else {
+      [rootItems removeObject:searchGroup_];
+    }
+    [root_ setChildren:rootItems];
+    [self itemChanged:root_ childrenChanged:YES];
+  }
+}
+
+// Called when the user modifies the search field.
 - (IBAction)searchFieldChanged:(id)sender {
   [self updateSearch];
-  if ([[searchField_ stringValue] length])
-    [self showGroup:searchGroup_];
+  if ([[searchField_ stringValue] length]) {
+    // There is search text. Show searchGroup_ if it's not visible yet:
+    [self setSearchGroupVisible:YES];
+
+    BookmarkItem *sel = [groupsController_ selectedItem];
+    if (sel != searchGroup_.get()) {
+      // Remember which group used to be selected.
+      preSearchGroup_.reset([sel retain]);
+      // And select searchGroup_.
+      [self showGroup:searchGroup_];
+    }
+
+  } else {
+    // No search text. Restore the pre-search group selction:
+    if (preSearchGroup_.get()) {
+      if ([groupsController_ selectedItem] == searchGroup_.get()) {
+        [self showGroup:preSearchGroup_];
+      }
+      preSearchGroup_.reset();
+    }
+    // Hide the Search Results group:
+    [self setSearchGroupVisible:NO];
+  }
 }
 
 - (IBAction)segmentedControlClicked:(id)sender {
   BookmarkTreeController* controller = [self focusedController];
   DCHECK(controller);
   NSSegmentedCell* cell = [sender cell];
   switch ([cell tagForSegment:[cell selectedSegment]]) {
     case 0:
       [controller newFolder:sender];
       break;
@@ skipping 98 matching lines @@
                       action:kMenuActions[i].action
                keyEquivalent:@""];
       [[[menu itemArray] lastObject] setTarget:self];
     } else {
       [menu addItem:[NSMenuItem separatorItem]];
     }
   }
 }
 
 @end