[Mac] Fix beta-blocking bugs in the cookies manager

* Auto-expand the Cookies folder after expanding a domain-level folder
* XIB change: disable multiple selection (and removal) of cookies to prevent a crash
* Auto-select the next cookie after deletion

BUG=31678,32002,32022

TEST=Open cookies manager. Expand a domain and Cookies folder should auto-expand.
TEST=Open cookies manager. Should not be able to perform multiple selection or deletion.
TEST=Open cookies manager. Expand domain with multiple cookies. Delete the first cookie. Second cookie should now be selected.

Review URL: http://codereview.chromium.org/542091

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36443 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 29 insertions, 3 deletions

diff --git a/chrome/browser/cocoa/cookies_window_controller.mm b/chrome/browser/cocoa/cookies_window_controller.mm
index 41ba73f..25d4120 100644
--- a/chrome/browser/cocoa/cookies_window_controller.mm
+++ b/chrome/browser/cocoa/cookies_window_controller.mm
@@ -184,11 +184,19 @@ CocoaCookieTreeNode* CookiesTreeModelObserverBridge::FindCocoaNode(
 }
 
 - (IBAction)deleteCookie:(id)sender {
-  scoped_nsobject<NSArray> selection(
-      [[treeController_ selectedObjects] retain]);
-  for (CocoaCookieTreeNode* node in selection.get()) {
+  NSIndexPath* selectionPath = [treeController_ selectionIndexPath];
+  // N.B.: I suspect that |-selectedObjects| does not retain/autorelease the
+  // return value, which may result in the pointer going to garbage before it
+  // even goes out of scope. Retaining it immediately will fix this.
+  NSArray* selection = [treeController_ selectedObjects];
+  if (selectionPath) {
+    DCHECK_EQ([selection count], 1U);
+    CocoaCookieTreeNode* node = [selection lastObject];
     CookieTreeNode* cookie = static_cast<CookieTreeNode*>([node treeNode]);
     treeModel_->DeleteCookieNode(cookie);
+    // If there is a next cookie, this will select it because items will slide
+    // up. If there is no next cookie, this is a no-op.
+    [treeController_ setSelectionIndexPath:selectionPath];
   }
 }
 
@@ -229,6 +237,24 @@ CocoaCookieTreeNode* CookiesTreeModelObserverBridge::FindCocoaNode(
   [(ImageAndTextCell*)cell setImage:icon];
 }
 
+- (void)outlineViewItemDidExpand:(NSNotification*)notif {
+  NSTreeNode* item = [[notif userInfo] objectForKey:@"NSObject"];
+  CocoaCookieTreeNode* node = [item representedObject];
+  NSArray* children = [node children];
+  if ([children count] == 1U) {
+    // The node that will expand has one child. Do the user a favor and expand
+    // that node (saving her a click) if it is non-leaf.
+    CocoaCookieTreeNode* child = [children lastObject];
+    if (![child isLeaf]) {
+      NSOutlineView* outlineView = [notif object];
+      // Tell the OutlineView to expand the NSTreeNode, not the model object.
+      children = [item childNodes];
+      DCHECK_EQ([children count], 1U);
+      [outlineView expandItem:[children lastObject]];
+    }
+  }
+}
+
 #pragma mark Unit Testing
 
 - (CookiesTreeModelObserverBridge*)modelObserver {