Add multiple selection support to chooser on desktops

chrome/browser/ui/cocoa/chooser_content_view_cocoa.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/chooser_content_view_cocoa.h"
 
 #include <algorithm>
 
 #include "base/macros.h"
 #include "base/strings/sys_string_conversions.h"
@@ skipping 297 matching lines @@
   [table_view_ setHidden:NO];
   [spinner_ setHidden:YES];
 }
 
 void ChooserContentViewController::OnOptionRemoved(size_t index) {
   // |table_view_| will automatically select the removed item's next item.
   // So here it tracks if the removed item is the item that was currently
   // selected, if so, deselect it. Also if the removed item is before the
   // currently selected item, the currently selected item's index needs to
   // be adjusted by one.
-  NSInteger idx = static_cast<NSInteger>(index);
-  NSInteger selected_row = [table_view_ selectedRow];
-  if (selected_row == idx) {
-    [table_view_ deselectRow:idx];
-  } else if (selected_row > idx) {
-    [table_view_
-            selectRowIndexes:[NSIndexSet indexSetWithIndex:selected_row - 1]
-        byExtendingSelection:NO];
+  NSUInteger idx = static_cast<NSUInteger>(index);

[Robert Sesek, 2016/11/22 19:07:29]

Is the cast necessary? size_t should be the same as NSUInteger.

[juncai, 2016/11/22 23:12:06]

Done.

+  NSIndexSet* selected_rows = [table_view_ selectedRowIndexes];
+  NSMutableIndexSet* updated_selected_rows = [NSMutableIndexSet indexSet];
+  NSUInteger row = [selected_rows firstIndex];
+  while (row != NSNotFound) {
+    if (row < idx)
+      [updated_selected_rows addIndex:row];
+    else if (row > idx)
+      [updated_selected_rows addIndex:row - 1];
+    row = [selected_rows indexGreaterThanIndex:row];
   }
 
+  [table_view_ selectRowIndexes:updated_selected_rows byExtendingSelection:NO];
+
   UpdateTableView();
 }
 
 void ChooserContentViewController::OnOptionUpdated(size_t index) {
   UpdateTableView();
 }
 
 void ChooserContentViewController::OnAdapterEnabledChanged(bool enabled) {
   // No row is selected since the adapter status has changed.
   // This will also disable the OK button if it was enabled because
@@ skipping 34 matching lines @@
   // When complete, show |word_connector_| and |rescan_button_| and hide
   // |scanning_message_|.
   [scanning_message_ setHidden:refreshing ? NO : YES];
   [word_connector_ setHidden:refreshing ? YES : NO];
   [rescan_button_ setHidden:refreshing ? YES : NO];
 }
 
 void ChooserContentViewController::UpdateTableView() {
   [table_view_ setEnabled:chooser_controller_->NumOptions() > 0];
   // For NSView-based table views, calling reloadData will deselect the
-  // currently selected row, so |selected_row| stores the currently selected
-  // row in order to select it again.
-  NSInteger selected_row = [table_view_ selectedRow];
+  // currently selected row, so |selected_rows| stores the currently selected
+  // rows in order to select them again.
+  NSIndexSet* selected_rows = [table_view_ selectedRowIndexes];
   [table_view_ reloadData];
-  if (selected_row != -1) {
-    [table_view_ selectRowIndexes:[NSIndexSet indexSetWithIndex:selected_row]
-             byExtendingSelection:NO];
-  }
+  [table_view_ selectRowIndexes:selected_rows byExtendingSelection:NO];
 }
 
 @implementation ChooserContentViewCocoa
 
 // TODO(juncai): restructure this function to be some smaller methods to
 // create the pieces for the view. By doing so, the methods that calculate
 // the frame and origins can be moved into those methods, rather than as
 // helper functions.
 - (instancetype)initWithChooserTitle:(NSString*)chooserTitle
                    chooserController:
@@ skipping 93 matching lines @@
     [scrollView_ setDrawsBackground:NO];
 
     // TableView.
     tableView_.reset([[NSTableView alloc] initWithFrame:NSZeroRect]);
     tableColumn_.reset([[NSTableColumn alloc] initWithIdentifier:@""]);
     [tableColumn_ setWidth:(scrollViewWidth - kMarginX)];
     [tableView_ addTableColumn:tableColumn_];
     // Make the column title invisible.
     [tableView_ setHeaderView:nil];
     [tableView_ setFocusRingType:NSFocusRingTypeNone];
+    [tableView_
+        setAllowsMultipleSelection:chooserController_->AllowMultipleSelection()
+                                       ? YES
+                                       : NO];
 
     // Spinner.
     // Set the spinner in the center of the scroll view.
     CGFloat spinnerOriginX =
         scrollViewOriginX + (scrollViewWidth - kSpinnerSize) / 2;
     CGFloat spinnerOriginY =
         scrollViewOriginY + (scrollViewHeight - kSpinnerSize) / 2;
     spinner_.reset([[SpinnerView alloc]
         initWithFrame:NSMakeRect(spinnerOriginX, spinnerOriginY, kSpinnerSize,
                                  kSpinnerSize)]);
@@ skipping 274 matching lines @@
 
   return base::SysUTF16ToNSString(
       chooserController_->GetOption(static_cast<size_t>(index)));
 }
 
 - (void)updateTableView {
   chooserContentViewController_->UpdateTableView();
 }
 
 - (void)accept {
-  chooserController_->Select([tableView_ selectedRow]);
+  NSIndexSet* selectedRows = [tableView_ selectedRowIndexes];
+  NSUInteger index = [selectedRows firstIndex];
+  while (index != NSNotFound) {
+    chooserController_->Select(index);
+    index = [selectedRows indexGreaterThanIndex:index];
+  }
 }
 
 - (void)cancel {
   chooserController_->Cancel();
 }
 
 - (void)close {
   chooserController_->Close();
 }
 
 - (void)onAdapterOffHelp:(id)sender {
   chooserController_->OpenAdapterOffHelpUrl();
 }
 
 - (void)onRescan:(id)sender {
   chooserController_->RefreshOptions();
 }
 
 - (void)onHelpPressed:(id)sender {
   chooserController_->OpenHelpCenterUrl();
 }
 
 - (void)updateContentRowColor {
-  NSInteger selectedRow = [tableView_ selectedRow];
+  NSIndexSet* selectedRows = [tableView_ selectedRowIndexes];
   NSInteger numOptions =
       base::checked_cast<NSInteger>(chooserController_->NumOptions());
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   for (NSInteger rowIndex = 0; rowIndex < numOptions; ++rowIndex) {
+    BOOL isSelected = [selectedRows containsIndex:rowIndex];
     // Update the color of the text.
     [[self tableRowViewText:rowIndex]
-        setTextColor:(rowIndex == selectedRow ? [NSColor whiteColor]
-                                              : [NSColor blackColor])];
+        setTextColor:(isSelected ? [NSColor whiteColor]
+                                 : [NSColor blackColor])];
 
     // Update the color of the image.
     if (chooserController_->ShouldShowIconBeforeText()) {
       if (chooserController_->IsConnected(rowIndex)) {
         [[self tableRowViewImage:rowIndex]
             setImage:gfx::NSImageFromImageSkia(gfx::CreateVectorIcon(
                          gfx::VectorIconId::BLUETOOTH_CONNECTED,
-                         rowIndex == selectedRow ? SK_ColorWHITE
-                                                 : gfx::kChromeIconGrey))];
+                         isSelected ? SK_ColorWHITE : gfx::kChromeIconGrey))];
       } else {
         int signalStrengthLevel =
             chooserController_->GetSignalStrengthLevel(rowIndex);
         if (signalStrengthLevel != -1) {
           int imageId =
-              rowIndex == selectedRow
+              isSelected
                   ? kSignalStrengthLevelImageSelectedIds[signalStrengthLevel]
                   : kSignalStrengthLevelImageIds[signalStrengthLevel];
           [[self tableRowViewImage:rowIndex]
               setImage:rb.GetNativeImageNamed(imageId).ToNSImage()];
         }
       }
     }
 
     // Update the color of paired status.
     NSTextField* pairedStatusText = [self tableRowViewPairedStatus:rowIndex];
     if (pairedStatusText) {
-      [pairedStatusText
-          setTextColor:(skia::SkColorToCalibratedNSColor(
-                           rowIndex == selectedRow ? gfx::kGoogleGreen300
-                                                   : gfx::kGoogleGreen700))];
+      [pairedStatusText setTextColor:(skia::SkColorToCalibratedNSColor(
+                                         isSelected ? gfx::kGoogleGreen300
+                                                    : gfx::kGoogleGreen700))];
     }
   }
 }
 
 - (NSImageView*)tableRowViewImage:(NSInteger)row {
   ChooserContentTableRowView* tableRowView =
       [tableView_ viewAtColumn:0 row:row makeIfNecessary:YES];
   return [tableRowView image];
 }
 
@@ skipping 11 matching lines @@
 
 - (void)drawRect:(NSRect)rect {
   [[NSColor colorWithCalibratedWhite:245.0f / 255.0f alpha:1.0f] setFill];
   NSRect footnoteFrame =
       NSMakeRect(0.0f, 0.0f, kChooserWidth, separatorOriginY_);
   NSRectFill(footnoteFrame);
   [super drawRect:footnoteFrame];
 }
 
 @end