Use Chrome file dialogs on all platforms and runtimes (fixes issue #3314)

All file dialogs irrespective of source, platform and runtime will now be routed through CefFileDialogManager and trigger CefDialogHandler callbacks (see issue #3293). Adds Chrome runtime support for CefBrowserHost::RunFileDialog and CefDialogHandler callbacks. Adds Alloy runtime support for internal GTK file and print dialogs on Linux subject to the following limitations: 1. Internal GTK implementation: - Cannot be used with multi-threaded-message-loop because Chromium's internal GTK implementation is not thread-safe (does not use GDK threads). - Dialogs will not be modal to application windows when used with off-screen rendering due to lack of access to the client's top-level GtkWindow. 2. Cefclient CefDialogHandler implementation: - Cannot be used with Views because it requires a top-level GtkWindow. Due to the above limitations no dialog implementation is currently provided for Views + multi-threaded-message-loop on Linux. In cases where both implementations are supported the cefclient version is now behind an optional `--use-client-dialogs` command-line flag. Expressly forbids multiple simultaneous file dialogs with the internal platform implementation which uses modal dialogs. CefDialogHandler will still be notified and can optionally handle each request without a modal dialog (see issue #3154). Removes some RunFileDialog parameters that are not supported by the Chrome file dialog implementation (selected_accept_filter parameter, cef_file_dialog_mode_t overwrite/read-only flags).
2025-06-05 21:39:12 +02:00 · 2022-04-15 15:55:23 -04:00
parent edef01f579
commit 2ea7459a89
75 changed files with 1566 additions and 2231 deletions
--- a/libcef_dll/cpptoc/browser_host_cpptoc.cc
+++ b/libcef_dll/cpptoc/browser_host_cpptoc.cc
@@ -9,7 +9,7 @@
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
-// $hash=289bb032a65bfd1f35a97d93e14df1f5762a9394$
+// $hash=65c260e354b6dc85bf121b60081eff450b043542$
 //

 #include "libcef_dll/cpptoc/browser_host_cpptoc.h"
@@ -318,7 +318,6 @@ browser_host_run_file_dialog(struct _cef_browser_host_t* self,
                             const cef_string_t* title,
                             const cef_string_t* default_file_path,
                             cef_string_list_t accept_filters,
-                             int selected_accept_filter,
                             cef_run_file_dialog_callback_t* callback) {
  shutdown_checker::AssertNotShutdown();

@@ -327,10 +326,6 @@ browser_host_run_file_dialog(struct _cef_browser_host_t* self,
  DCHECK(self);
  if (!self)
    return;
-  // Verify param: selected_accept_filter; type: simple_byval
-  DCHECK_GE(selected_accept_filter, 0);
-  if (selected_accept_filter < 0)
-    return;
  // Verify param: callback; type: refptr_diff
  DCHECK(callback);
  if (!callback)
@@ -344,7 +339,7 @@ browser_host_run_file_dialog(struct _cef_browser_host_t* self,
  // Execute
  CefBrowserHostCppToC::Get(self)->RunFileDialog(
      mode, CefString(title), CefString(default_file_path), accept_filtersList,
-      selected_accept_filter, CefRunFileDialogCallbackCToCpp::Wrap(callback));
+      CefRunFileDialogCallbackCToCpp::Wrap(callback));
 }

 void CEF_CALLBACK browser_host_start_download(struct _cef_browser_host_t* self,
--- a/libcef_dll/cpptoc/dialog_handler_cpptoc.cc
+++ b/libcef_dll/cpptoc/dialog_handler_cpptoc.cc
@@ -9,7 +9,7 @@
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
-// $hash=639576c610ca3898809cdee6d19c45253e9ea4d2$
+// $hash=3e2fc4cf108e13165c53ee3e8b10b483dbe5ff5e$
 //

 #include "libcef_dll/cpptoc/dialog_handler_cpptoc.h"
@@ -29,7 +29,6 @@ dialog_handler_on_file_dialog(struct _cef_dialog_handler_t* self,
                              const cef_string_t* title,
                              const cef_string_t* default_file_path,
                              cef_string_list_t accept_filters,
-                              int selected_accept_filter,
                              cef_file_dialog_callback_t* callback) {
  shutdown_checker::AssertNotShutdown();

@@ -42,10 +41,6 @@ dialog_handler_on_file_dialog(struct _cef_dialog_handler_t* self,
  DCHECK(browser);
  if (!browser)
    return 0;
-  // Verify param: selected_accept_filter; type: simple_byval
-  DCHECK_GE(selected_accept_filter, 0);
-  if (selected_accept_filter < 0)
-    return 0;
  // Verify param: callback; type: refptr_diff
  DCHECK(callback);
  if (!callback)
@@ -59,7 +54,7 @@ dialog_handler_on_file_dialog(struct _cef_dialog_handler_t* self,
  // Execute
  bool _retval = CefDialogHandlerCppToC::Get(self)->OnFileDialog(
      CefBrowserCToCpp::Wrap(browser), mode, CefString(title),
-      CefString(default_file_path), accept_filtersList, selected_accept_filter,
+      CefString(default_file_path), accept_filtersList,
      CefFileDialogCallbackCToCpp::Wrap(callback));

  // Return type: bool
--- a/libcef_dll/cpptoc/file_dialog_callback_cpptoc.cc
+++ b/libcef_dll/cpptoc/file_dialog_callback_cpptoc.cc
@@ -9,7 +9,7 @@
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
-// $hash=d334e579f498ad7727721dfe4e10ad810b81035a$
+// $hash=1abedb0e8e7a0101d9ff3f4918f992f3c010d5a6$
 //

 #include "libcef_dll/cpptoc/file_dialog_callback_cpptoc.h"
@@ -22,7 +22,6 @@ namespace {

 void CEF_CALLBACK
 file_dialog_callback_cont(struct _cef_file_dialog_callback_t* self,
-                          int selected_accept_filter,
                          cef_string_list_t file_paths) {
  shutdown_checker::AssertNotShutdown();

@@ -31,10 +30,6 @@ file_dialog_callback_cont(struct _cef_file_dialog_callback_t* self,
  DCHECK(self);
  if (!self)
    return;
-  // Verify param: selected_accept_filter; type: simple_byval
-  DCHECK_GE(selected_accept_filter, 0);
-  if (selected_accept_filter < 0)
-    return;
  // Unverified params: file_paths

  // Translate param: file_paths; type: string_vec_byref_const
@@ -42,8 +37,7 @@ file_dialog_callback_cont(struct _cef_file_dialog_callback_t* self,
  transfer_string_list_contents(file_paths, file_pathsList);

  // Execute
-  CefFileDialogCallbackCppToC::Get(self)->Continue(selected_accept_filter,
-                                                   file_pathsList);
+  CefFileDialogCallbackCppToC::Get(self)->Continue(file_pathsList);
 }

 void CEF_CALLBACK
--- a/libcef_dll/cpptoc/run_file_dialog_callback_cpptoc.cc
+++ b/libcef_dll/cpptoc/run_file_dialog_callback_cpptoc.cc
@@ -9,7 +9,7 @@
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
-// $hash=2e6aa9015192a3704df073f7dad0c6fa3b05f76c$
+// $hash=15fb714ee545d6ea2057ab82aec380dc25739199$
 //

 #include "libcef_dll/cpptoc/run_file_dialog_callback_cpptoc.h"
@@ -22,7 +22,6 @@ namespace {

 void CEF_CALLBACK run_file_dialog_callback_on_file_dialog_dismissed(
    struct _cef_run_file_dialog_callback_t* self,
-    int selected_accept_filter,
    cef_string_list_t file_paths) {
  shutdown_checker::AssertNotShutdown();

@@ -31,10 +30,6 @@ void CEF_CALLBACK run_file_dialog_callback_on_file_dialog_dismissed(
  DCHECK(self);
  if (!self)
    return;
-  // Verify param: selected_accept_filter; type: simple_byval
-  DCHECK_GE(selected_accept_filter, 0);
-  if (selected_accept_filter < 0)
-    return;
  // Unverified params: file_paths

  // Translate param: file_paths; type: string_vec_byref_const
@@ -43,7 +38,7 @@ void CEF_CALLBACK run_file_dialog_callback_on_file_dialog_dismissed(

  // Execute
  CefRunFileDialogCallbackCppToC::Get(self)->OnFileDialogDismissed(
-      selected_accept_filter, file_pathsList);
+      file_pathsList);
 }

 }  // namespace
--- a/libcef_dll/ctocpp/browser_host_ctocpp.cc
+++ b/libcef_dll/ctocpp/browser_host_ctocpp.cc
@@ -9,7 +9,7 @@
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
-// $hash=2edab12ab1759213ab9a6b7620ea39a74291abc7$
+// $hash=fa3208182bcdb9aab36096b3ce5ecdd35cb0a80f$
 //

 #include "libcef_dll/ctocpp/browser_host_ctocpp.h"
@@ -261,7 +261,6 @@ void CefBrowserHostCToCpp::RunFileDialog(
    const CefString& title,
    const CefString& default_file_path,
    const std::vector<CefString>& accept_filters,
-    int selected_accept_filter,
    CefRefPtr<CefRunFileDialogCallback> callback) {
  shutdown_checker::AssertNotShutdown();

@@ -271,10 +270,6 @@ void CefBrowserHostCToCpp::RunFileDialog(

  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING

-  // Verify param: selected_accept_filter; type: simple_byval
-  DCHECK_GE(selected_accept_filter, 0);
-  if (selected_accept_filter < 0)
-    return;
  // Verify param: callback; type: refptr_diff
  DCHECK(callback.get());
  if (!callback.get())
@@ -290,7 +285,6 @@ void CefBrowserHostCToCpp::RunFileDialog(
  // Execute
  _struct->run_file_dialog(_struct, mode, title.GetStruct(),
                           default_file_path.GetStruct(), accept_filtersList,
-                           selected_accept_filter,
                           CefRunFileDialogCallbackCppToC::Wrap(callback));

  // Restore param:accept_filters; type: string_vec_byref_const
--- a/libcef_dll/ctocpp/browser_host_ctocpp.h
+++ b/libcef_dll/ctocpp/browser_host_ctocpp.h
@@ -9,7 +9,7 @@
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
-// $hash=6de4205143b6855e7ccf54da14a0494db0b4aaa3$
+// $hash=e82e7bf06a027262268172fd74254a8af087e528$
 //

 #ifndef CEF_LIBCEF_DLL_CTOCPP_BROWSER_HOST_CTOCPP_H_
@@ -52,7 +52,6 @@ class CefBrowserHostCToCpp : public CefCToCppRefCounted<CefBrowserHostCToCpp,
                     const CefString& title,
                     const CefString& default_file_path,
                     const std::vector<CefString>& accept_filters,
-                     int selected_accept_filter,
                     CefRefPtr<CefRunFileDialogCallback> callback) override;
  void StartDownload(const CefString& url) override;
  void DownloadImage(const CefString& image_url,
--- a/libcef_dll/ctocpp/dialog_handler_ctocpp.cc
+++ b/libcef_dll/ctocpp/dialog_handler_ctocpp.cc
@@ -9,7 +9,7 @@
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
-// $hash=cac933371fc47c864230d4537ef1da76cd7e4d8e$
+// $hash=336c57e3c57a1a5bf8fa4a39aee8f204788ccddb$
 //

 #include "libcef_dll/ctocpp/dialog_handler_ctocpp.h"
@@ -27,7 +27,6 @@ bool CefDialogHandlerCToCpp::OnFileDialog(
    const CefString& title,
    const CefString& default_file_path,
    const std::vector<CefString>& accept_filters,
-    int selected_accept_filter,
    CefRefPtr<CefFileDialogCallback> callback) {
  shutdown_checker::AssertNotShutdown();

@@ -41,10 +40,6 @@ bool CefDialogHandlerCToCpp::OnFileDialog(
  DCHECK(browser.get());
  if (!browser.get())
    return false;
-  // Verify param: selected_accept_filter; type: simple_byval
-  DCHECK_GE(selected_accept_filter, 0);
-  if (selected_accept_filter < 0)
-    return false;
  // Verify param: callback; type: refptr_diff
  DCHECK(callback.get());
  if (!callback.get())
@@ -60,7 +55,7 @@ bool CefDialogHandlerCToCpp::OnFileDialog(
  // Execute
  int _retval = _struct->on_file_dialog(
      _struct, CefBrowserCppToC::Wrap(browser), mode, title.GetStruct(),
-      default_file_path.GetStruct(), accept_filtersList, selected_accept_filter,
+      default_file_path.GetStruct(), accept_filtersList,
      CefFileDialogCallbackCppToC::Wrap(callback));

  // Restore param:accept_filters; type: string_vec_byref_const
--- a/libcef_dll/ctocpp/dialog_handler_ctocpp.h
+++ b/libcef_dll/ctocpp/dialog_handler_ctocpp.h
@@ -9,7 +9,7 @@
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
-// $hash=4c07a40d3bd171adf3ae3cc4aa935bc7eca4aa5e$
+// $hash=1577adae508ad046bb2c7786f040ccc599087b8d$
 //

 #ifndef CEF_LIBCEF_DLL_CTOCPP_DIALOG_HANDLER_CTOCPP_H_
@@ -41,7 +41,6 @@ class CefDialogHandlerCToCpp
                    const CefString& title,
                    const CefString& default_file_path,
                    const std::vector<CefString>& accept_filters,
-                    int selected_accept_filter,
                    CefRefPtr<CefFileDialogCallback> callback) override;
 };

--- a/libcef_dll/ctocpp/file_dialog_callback_ctocpp.cc
+++ b/libcef_dll/ctocpp/file_dialog_callback_ctocpp.cc
@@ -9,7 +9,7 @@
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
-// $hash=8fecb808fb6a84d630d1e8c5380a5ffd900b3654$
+// $hash=9fb143d4df823ed6a7dfca295ce4ca2b5756df9c$
 //

 #include "libcef_dll/ctocpp/file_dialog_callback_ctocpp.h"
@@ -20,7 +20,6 @@

 NO_SANITIZE("cfi-icall")
 void CefFileDialogCallbackCToCpp::Continue(
-    int selected_accept_filter,
    const std::vector<CefString>& file_paths) {
  shutdown_checker::AssertNotShutdown();

@@ -30,10 +29,6 @@ void CefFileDialogCallbackCToCpp::Continue(

  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING

-  // Verify param: selected_accept_filter; type: simple_byval
-  DCHECK_GE(selected_accept_filter, 0);
-  if (selected_accept_filter < 0)
-    return;
  // Unverified params: file_paths

  // Translate param: file_paths; type: string_vec_byref_const
@@ -43,7 +38,7 @@ void CefFileDialogCallbackCToCpp::Continue(
    transfer_string_list_contents(file_paths, file_pathsList);

  // Execute
-  _struct->cont(_struct, selected_accept_filter, file_pathsList);
+  _struct->cont(_struct, file_pathsList);

  // Restore param:file_paths; type: string_vec_byref_const
  if (file_pathsList)
--- a/libcef_dll/ctocpp/file_dialog_callback_ctocpp.h
+++ b/libcef_dll/ctocpp/file_dialog_callback_ctocpp.h
@@ -9,7 +9,7 @@
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
-// $hash=d84ac439b3372160aa3886b28b3ff81e49f05a6d$
+// $hash=acb14970579704b71425d23b2bb7468f782a1e17$
 //

 #ifndef CEF_LIBCEF_DLL_CTOCPP_FILE_DIALOG_CALLBACK_CTOCPP_H_
@@ -36,8 +36,7 @@ class CefFileDialogCallbackCToCpp
  virtual ~CefFileDialogCallbackCToCpp();

  // CefFileDialogCallback methods.
-  void Continue(int selected_accept_filter,
-                const std::vector<CefString>& file_paths) override;
+  void Continue(const std::vector<CefString>& file_paths) override;
  void Cancel() override;
 };

--- a/libcef_dll/ctocpp/run_file_dialog_callback_ctocpp.cc
+++ b/libcef_dll/ctocpp/run_file_dialog_callback_ctocpp.cc
@@ -9,7 +9,7 @@
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
-// $hash=cb29585261ed25ddd2ee1b4b5c890565e72e5d22$
+// $hash=ef632f8846499c0605300240a2ec7240a1750ce2$
 //

 #include "libcef_dll/ctocpp/run_file_dialog_callback_ctocpp.h"
@@ -20,7 +20,6 @@

 NO_SANITIZE("cfi-icall")
 void CefRunFileDialogCallbackCToCpp::OnFileDialogDismissed(
-    int selected_accept_filter,
    const std::vector<CefString>& file_paths) {
  shutdown_checker::AssertNotShutdown();

@@ -30,10 +29,6 @@ void CefRunFileDialogCallbackCToCpp::OnFileDialogDismissed(

  // AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING

-  // Verify param: selected_accept_filter; type: simple_byval
-  DCHECK_GE(selected_accept_filter, 0);
-  if (selected_accept_filter < 0)
-    return;
  // Unverified params: file_paths

  // Translate param: file_paths; type: string_vec_byref_const
@@ -43,8 +38,7 @@ void CefRunFileDialogCallbackCToCpp::OnFileDialogDismissed(
    transfer_string_list_contents(file_paths, file_pathsList);

  // Execute
-  _struct->on_file_dialog_dismissed(_struct, selected_accept_filter,
-                                    file_pathsList);
+  _struct->on_file_dialog_dismissed(_struct, file_pathsList);

  // Restore param:file_paths; type: string_vec_byref_const
  if (file_pathsList)
--- a/libcef_dll/ctocpp/run_file_dialog_callback_ctocpp.h
+++ b/libcef_dll/ctocpp/run_file_dialog_callback_ctocpp.h
@@ -9,7 +9,7 @@
 // implementations. See the translator.README.txt file in the tools directory
 // for more information.
 //
-// $hash=63d2d1da715395296899acc4ed165cf7dae4d78c$
+// $hash=12c1546549e1b0d29beb91241361581f3e3da67f$
 //

 #ifndef CEF_LIBCEF_DLL_CTOCPP_RUN_FILE_DIALOG_CALLBACK_CTOCPP_H_
@@ -38,8 +38,7 @@ class CefRunFileDialogCallbackCToCpp
  virtual ~CefRunFileDialogCallbackCToCpp();

  // CefRunFileDialogCallback methods.
-  void OnFileDialogDismissed(int selected_accept_filter,
-                             const std::vector<CefString>& file_paths) override;
+  void OnFileDialogDismissed(const std::vector<CefString>& file_paths) override;
 };

 #endif  // CEF_LIBCEF_DLL_CTOCPP_RUN_FILE_DIALOG_CALLBACK_CTOCPP_H_