bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Pass mime type values as file dialog accept filters (see #3314)

Browse Source 
File dialogs that specify mime type (e.g. "image/*") accept filters will pass
those values unchanged to the OnFileDialog |accept_filters| parameter. The
default dialog implementation will show those filters in addition to a combined
"Custom Files" filter. This is a change from preexisting Google Chrome
behavior where only the combined "Custom Files" filter is displayed, and
restores CEF behavior that existed prior to 2ea7459a89.

Document the fact that OnFileDialog may be called twice, once before MIME type
expansion and once afterwards.

Add new OnFileDialog |accept_extensions| and |accept_descriptions| parameters
for MIME type extensions and descriptions.

Details: This change adds a SelectFileDialog::FileTypeInfo::extension_mimetypes
member and improves the logic in FileSelectHelper::GetFileTypesFromAcceptType
and file_dialog_manager.cc SelectFileToFileChooserParams to support recall of
the source mime type when populating the FileChooserParams structure.

To test:
- Run `ceftests --gtest_filter=DialogTest.*`
- Run `cefclient --url=https://tests/dialogs`
This commit is contained in:
Marshall Greenblatt
2024-05-29 16:38:00 -04:00
parent 34de39aac8
commit 20a659fa66
16 changed files with 389 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
libcef_dll/ctocpp/dialog_handler_ctocpp.cc
View File

@ -9,7 +9,7 @@
// implementations. See the translator.README.txt file in the tools directory
// for more information.
//
// $hash=40bd7cc8a8fd361aceda9bbd426f912ac140ac3d$
// $hash=bd2c8c9be10525d69d072dacfb3cfd215486e077$
//
#include "libcef_dll/ctocpp/dialog_handler_ctocpp.h"
@ -28,6 +28,8 @@ bool CefDialogHandlerCToCpp::OnFileDialog(
const CefString& title,
const CefString& default_file_path,
const std::vector<CefString>& accept_filters,
const std::vector<CefString>& accept_extensions,
const std::vector<CefString>& accept_descriptions,
CefRefPtr<CefFileDialogCallback> callback) {
shutdown_checker::AssertNotShutdown();
@ -48,7 +50,8 @@ bool CefDialogHandlerCToCpp::OnFileDialog(
if (!callback.get()) {
return false;
}
// Unverified params: title, default_file_path, accept_filters
// Unverified params: title, default_file_path, accept_filters,
// accept_extensions, accept_descriptions
// Translate param: accept_filters; type: string_vec_byref_const
cef_string_list_t accept_filtersList = cef_string_list_alloc();
@ -56,17 +59,37 @@ bool CefDialogHandlerCToCpp::OnFileDialog(
if (accept_filtersList) {
transfer_string_list_contents(accept_filters, accept_filtersList);
}
// Translate param: accept_extensions; type: string_vec_byref_const
cef_string_list_t accept_extensionsList = cef_string_list_alloc();
DCHECK(accept_extensionsList);
if (accept_extensionsList) {
transfer_string_list_contents(accept_extensions, accept_extensionsList);
}
// Translate param: accept_descriptions; type: string_vec_byref_const
cef_string_list_t accept_descriptionsList = cef_string_list_alloc();
DCHECK(accept_descriptionsList);
if (accept_descriptionsList) {
transfer_string_list_contents(accept_descriptions, accept_descriptionsList);
}
// Execute
int _retval = _struct->on_file_dialog(
_struct, CefBrowserCppToC::Wrap(browser), mode, title.GetStruct(),
default_file_path.GetStruct(), accept_filtersList,
CefFileDialogCallbackCppToC::Wrap(callback));
default_file_path.GetStruct(), accept_filtersList, accept_extensionsList,
accept_descriptionsList, CefFileDialogCallbackCppToC::Wrap(callback));
// Restore param:accept_filters; type: string_vec_byref_const
if (accept_filtersList) {
cef_string_list_free(accept_filtersList);
}
// Restore param:accept_extensions; type: string_vec_byref_const
if (accept_extensionsList) {
cef_string_list_free(accept_extensionsList);
}
// Restore param:accept_descriptions; type: string_vec_byref_const
if (accept_descriptionsList) {
cef_string_list_free(accept_descriptionsList);
}
// Return type: bool
return _retval ? true : false;