AutoFill Profiles dialog handles multi-select and delete on Mac (Follow up)

chrome/browser/autofill/autofill_dialog_controller_mac.mm

 // Copyright (c) 2010 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/autofill/autofill_dialog_controller_mac.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/mac_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/browser.h"
@@ skipping 342 matching lines @@
     [tableView_ selectRowIndexes:[NSIndexSet indexSetWithIndex:row]
             byExtendingSelection:NO];
   }
   [sheet orderOut:self];
   creditCardSheetController.reset(nil);
 }
 
 // Deletes selected items; either addresses, credit cards, or a mixture of the
 // two depending on the items selected.
 - (IBAction)deleteSelection:(id)sender {
-  NSIndexSet* selectedRows = [tableView_ selectedRowIndexes];
+  NSIndexSet* selection = [tableView_ selectedRowIndexes];
   NSInteger selectedRow = [tableView_ selectedRow];
-  NSInteger rowCount = [tableView_ numberOfRows];
 
   // Loop through from last to first deleting selected items as we go.
-  for (NSInteger i = rowCount-1; i>=0; --i) {
-    if (![selectedRows containsIndex:i])
-      continue;
-
+  for (NSUInteger i = [selection lastIndex];
+       i != NSNotFound;
+       i = [selection indexLessThanIndex:i]) {
     // We keep track of the "top most" selection in the list so we know where
-    // to to set new selection below.
-    if (i < selectedRow)
-      selectedRow = i;
+    // to set new selection below.
+    selectedRow = i;
 
     if ([self isProfileRow:i]) {
       profiles_.erase(
           profiles_.begin() + [self profileIndexFromRow:i]);
     } else if ([self isCreditCardRow:i]) {
       creditCards_.erase(
           creditCards_.begin() + [self creditCardIndexFromRow:i]);
     }
   }
 
   // Select the previous row if possible, else current row, else deselect all.
   if ([self tableView:tableView_ shouldSelectRow:selectedRow-1]) {
     [tableView_ selectRowIndexes:[NSIndexSet indexSetWithIndex:selectedRow-1]
             byExtendingSelection:NO];
   } else if ([self tableView:tableView_ shouldSelectRow:selectedRow]) {
     [tableView_ selectRowIndexes:[NSIndexSet indexSetWithIndex:selectedRow]
             byExtendingSelection:NO];
   } else {
-    [tableView_ selectRowIndexes:[NSIndexSet indexSet] byExtendingSelection:NO];
+    [tableView_ deselectAll:self];
   }
 
   UpdateProfileLabels(&profiles_);
   [tableView_ reloadData];
 }
 
 // Edits the selected item, either address or credit card depending on the item
 // selected.
 - (IBAction)editSelection:(id)sender {
   NSInteger selectedRow = [tableView_ selectedRow];
@@ skipping 406 matching lines @@
   if (!image) {
     image = rb.GetNSImageNamed(IDR_INPUT_GOOD);
     DCHECK(image);
     return image;
   }
 
   return nil;
 }
 
 @end