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:
@@ -260,12 +260,6 @@ ClientHandler::ClientHandler(Delegate* delegate,
|
||||
initial_navigation_(true) {
|
||||
DCHECK(!console_log_file_.empty());
|
||||
|
||||
#if defined(OS_LINUX)
|
||||
// Provide the GTK-based dialog implementation on Linux.
|
||||
dialog_handler_ = new ClientDialogHandlerGtk();
|
||||
print_handler_ = new ClientPrintHandlerGtk();
|
||||
#endif
|
||||
|
||||
resource_manager_ = new CefResourceManager();
|
||||
test_runner::SetupResourceManager(resource_manager_, &string_resource_map_);
|
||||
|
||||
@@ -275,6 +269,34 @@ ClientHandler::ClientHandler(Delegate* delegate,
|
||||
mouse_cursor_change_disabled_ =
|
||||
command_line->HasSwitch(switches::kMouseCursorChangeDisabled);
|
||||
offline_ = command_line->HasSwitch(switches::kOffline);
|
||||
|
||||
#if defined(OS_LINUX)
|
||||
// Optionally use the client-provided dialog implementation.
|
||||
bool use_client_dialogs =
|
||||
command_line->HasSwitch(switches::kUseClientDialogs);
|
||||
|
||||
if (!use_client_dialogs &&
|
||||
command_line->HasSwitch(switches::kMultiThreadedMessageLoop)) {
|
||||
// Default dialogs are not supported in combination with
|
||||
// multi-threaded-message-loop because Chromium doesn't support GDK threads
|
||||
// internally.
|
||||
LOG(WARNING) << "Client dialogs must be used in combination with "
|
||||
"multi-threaded-message-loop.";
|
||||
use_client_dialogs = true;
|
||||
}
|
||||
|
||||
if (use_client_dialogs && MainContext::Get()->UseViews()) {
|
||||
// Client dialogs cannot be used in combination with Views because the
|
||||
// implementation of ClientDialogHandlerGtk requires a top-level GtkWindow.
|
||||
LOG(ERROR) << "Client dialogs cannot be used in combination with Views.";
|
||||
use_client_dialogs = false;
|
||||
}
|
||||
|
||||
if (use_client_dialogs) {
|
||||
dialog_handler_ = new ClientDialogHandlerGtk();
|
||||
print_handler_ = new ClientPrintHandlerGtk();
|
||||
}
|
||||
#endif // defined(OS_LINUX)
|
||||
}
|
||||
|
||||
void ClientHandler::DetachDelegate() {
|
||||
|
Reference in New Issue
Block a user