mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
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).
This commit is contained in:
@ -25,7 +25,6 @@ class ClientDialogHandlerGtk : public CefDialogHandler,
|
||||
const CefString& title,
|
||||
const CefString& default_file_path,
|
||||
const std::vector<CefString>& accept_filters,
|
||||
int selected_accept_filter,
|
||||
CefRefPtr<CefFileDialogCallback> callback) override;
|
||||
|
||||
// CefJSDialogHandler methods.
|
||||
@ -49,10 +48,10 @@ class ClientDialogHandlerGtk : public CefDialogHandler,
|
||||
CefString title;
|
||||
CefString default_file_path;
|
||||
std::vector<CefString> accept_filters;
|
||||
int selected_accept_filter;
|
||||
CefRefPtr<CefFileDialogCallback> callback;
|
||||
};
|
||||
void OnFileDialogContinue(OnFileDialogParams params, GtkWindow* window);
|
||||
void OnFileDialogContinue(const OnFileDialogParams& params,
|
||||
GtkWindow* window);
|
||||
|
||||
struct OnJSDialogParams {
|
||||
CefRefPtr<CefBrowser> browser;
|
||||
@ -62,7 +61,7 @@ class ClientDialogHandlerGtk : public CefDialogHandler,
|
||||
CefString default_prompt_text;
|
||||
CefRefPtr<CefJSDialogCallback> callback;
|
||||
};
|
||||
void OnJSDialogContinue(OnJSDialogParams params, GtkWindow* window);
|
||||
void OnJSDialogContinue(const OnJSDialogParams& params, GtkWindow* window);
|
||||
|
||||
void GetWindowAndContinue(CefRefPtr<CefBrowser> browser,
|
||||
base::OnceCallback<void(GtkWindow*)> callback);
|
||||
|
Reference in New Issue
Block a user