@@ -203,9 +203,8 @@ class CefFileSelectListener : public content::FileSelectListener {
203
203
class CefSelectFileDialogListener : public ui ::SelectFileDialog::Listener {
204
204
public:
205
205
CefSelectFileDialogListener (ui::SelectFileDialog::Listener* listener,
206
- void * params,
207
206
base::OnceClosure callback)
208
- : listener_(listener), params_(params), callback_(std::move(callback)) {}
207
+ : listener_(listener), callback_(std::move(callback)) {}
209
208
210
209
CefSelectFileDialogListener (const CefSelectFileDialogListener&) = delete ;
211
210
CefSelectFileDialogListener& operator =(const CefSelectFileDialogListener&) =
@@ -220,7 +219,7 @@ class CefSelectFileDialogListener : public ui::SelectFileDialog::Listener {
220
219
// Don't execute the listener.
221
220
Destroy ();
222
221
} else {
223
- FileSelectionCanceled (params_ );
222
+ FileSelectionCanceled ();
224
223
}
225
224
}
226
225
@@ -229,27 +228,22 @@ class CefSelectFileDialogListener : public ui::SelectFileDialog::Listener {
229
228
private:
230
229
~CefSelectFileDialogListener () override = default ;
231
230
232
- void FileSelected (const ui::SelectedFileInfo& file,
233
- int index,
234
- void * params) override {
235
- DCHECK_EQ (params, params_);
231
+ void FileSelected (const ui::SelectedFileInfo& file, int index) override {
236
232
executing_ = true ;
237
- listener_.ExtractAsDangling ()->FileSelected (file, index , params );
233
+ listener_.ExtractAsDangling ()->FileSelected (file, index );
238
234
Destroy ();
239
235
}
240
236
241
- void MultiFilesSelected (const std::vector<ui::SelectedFileInfo>& files,
242
- void * params) override {
243
- DCHECK_EQ (params, params_);
237
+ void MultiFilesSelected (
238
+ const std::vector<ui::SelectedFileInfo>& files) override {
244
239
executing_ = true ;
245
- listener_.ExtractAsDangling ()->MultiFilesSelected (files, params );
240
+ listener_.ExtractAsDangling ()->MultiFilesSelected (files);
246
241
Destroy ();
247
242
}
248
243
249
- void FileSelectionCanceled (void * params) override {
250
- DCHECK_EQ (params, params_);
244
+ void FileSelectionCanceled () override {
251
245
executing_ = true ;
252
- listener_.ExtractAsDangling ()->FileSelectionCanceled (params );
246
+ listener_.ExtractAsDangling ()->FileSelectionCanceled ();
253
247
Destroy ();
254
248
}
255
249
@@ -259,7 +253,6 @@ class CefSelectFileDialogListener : public ui::SelectFileDialog::Listener {
259
253
}
260
254
261
255
raw_ptr<ui::SelectFileDialog::Listener> listener_;
262
- const raw_ptr<void > params_;
263
256
base::OnceClosure callback_;
264
257
265
258
// Used to avoid re-entrancy from Cancel().
@@ -378,18 +371,16 @@ void CefFileDialogManager::RunSelectFile(
378
371
const ui::SelectFileDialog::FileTypeInfo* file_types,
379
372
int file_type_index,
380
373
const base::FilePath::StringType& default_extension,
381
- gfx::NativeWindow owning_window,
382
- void * params) {
374
+ gfx::NativeWindow owning_window) {
383
375
CEF_REQUIRE_UIT ();
384
376
385
377
active_listeners_.insert (listener);
386
378
387
379
auto chooser_params =
388
380
SelectFileToFileChooserParams (type, title, default_path, file_types);
389
- auto callback =
390
- base::BindOnce (&CefFileDialogManager::SelectFileDoneByDelegateCallback,
391
- weak_ptr_factory_.GetWeakPtr (),
392
- base::UnsafeDangling (listener), base::Unretained (params));
381
+ auto callback = base::BindOnce (
382
+ &CefFileDialogManager::SelectFileDoneByDelegateCallback,
383
+ weak_ptr_factory_.GetWeakPtr (), base::UnsafeDangling (listener));
393
384
callback = MaybeRunDelegate (chooser_params, file_types->extensions ,
394
385
file_types->extension_description_overrides ,
395
386
std::move (callback));
@@ -423,7 +414,7 @@ void CefFileDialogManager::RunSelectFile(
423
414
424
415
// This object will delete itself.
425
416
dialog_listener_ = new CefSelectFileDialogListener (
426
- listener, params,
417
+ listener,
427
418
base::BindOnce (&CefFileDialogManager::SelectFileDoneByListenerCallback,
428
419
weak_ptr_factory_.GetWeakPtr (),
429
420
base::UnsafeDangling (listener),
@@ -442,7 +433,7 @@ void CefFileDialogManager::RunSelectFile(
442
433
}
443
434
444
435
dialog_->SelectFile (type, title, default_path, file_types, file_type_index,
445
- default_extension, owning_window, params );
436
+ default_extension, owning_window);
446
437
}
447
438
448
439
void CefFileDialogManager::SelectFileListenerDestroyed (
@@ -549,7 +540,6 @@ CefFileDialogManager::MaybeRunDelegate(
549
540
550
541
void CefFileDialogManager::SelectFileDoneByDelegateCallback (
551
542
MayBeDangling<ui::SelectFileDialog::Listener> listener,
552
- void * params,
553
543
const std::vector<base::FilePath>& paths) {
554
544
CEF_REQUIRE_UIT ();
555
545
@@ -562,12 +552,11 @@ void CefFileDialogManager::SelectFileDoneByDelegateCallback(
562
552
active_listeners_.erase (listener.get ());
563
553
564
554
if (paths.empty ()) {
565
- listener->FileSelectionCanceled (params );
555
+ listener->FileSelectionCanceled ();
566
556
} else if (paths.size () == 1 ) {
567
- listener->FileSelected (ui::SelectedFileInfo (paths[0 ]), /* index=*/ 0 , params );
557
+ listener->FileSelected (ui::SelectedFileInfo (paths[0 ]), /* index=*/ 0 );
568
558
} else {
569
- listener->MultiFilesSelected (ui::FilePathListToSelectedFileInfoList (paths),
570
- params);
559
+ listener->MultiFilesSelected (ui::FilePathListToSelectedFileInfoList (paths));
571
560
}
572
561
// |listener| is likely deleted at this point.
573
562
}
0 commit comments