Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(815)

Unified Diff: chrome/browser/ui/views/chooser_content_view.cc

Issue 2518933004: Add multiple selection support to chooser on desktops (Closed)
Patch Set: address comments Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/chooser_content_view.cc
diff --git a/chrome/browser/ui/views/chooser_content_view.cc b/chrome/browser/ui/views/chooser_content_view.cc
index 35b450673e9fd6e56ef458953ebd002ed8ac7001..6f2b87b15e59c71315ffe62087ab934075204525 100644
--- a/chrome/browser/ui/views/chooser_content_view.cc
+++ b/chrome/browser/ui/views/chooser_content_view.cc
@@ -64,7 +64,7 @@ ChooserContentView::ChooserContentView(
this, table_columns,
chooser_controller_->ShouldShowIconBeforeText() ? views::ICON_AND_TEXT
: views::TEXT_ONLY,
- true /* single_selection */);
+ !chooser_controller_->AllowMultipleSelection() /* single_selection */);
table_view_->set_select_on_remove(false);
table_view_->SetObserver(table_view_observer);
table_view_->SetEnabled(chooser_controller_->NumOptions() > 0);
@@ -285,7 +285,10 @@ bool ChooserContentView::IsDialogButtonEnabled(ui::DialogButton button) const {
}
void ChooserContentView::Accept() {
- chooser_controller_->Select(table_view_->selection_model().active());
+ std::vector<size_t> indices(
+ table_view_->selection_model().selected_indices().begin(),
+ table_view_->selection_model().selected_indices().end());
+ chooser_controller_->Select(indices);
}
void ChooserContentView::Cancel() {

Powered by Google App Engine
This is Rietveld 408576698