mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Pass mime type values as file dialog accept filters (see #3314)
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:
@ -9,7 +9,7 @@
|
||||
// implementations. See the translator.README.txt file in the tools directory
|
||||
// for more information.
|
||||
//
|
||||
// $hash=1bb6115ab6501d8d006585cede00970e59af9868$
|
||||
// $hash=3c95f12406eee58308a2c019e8081e0710769e0d$
|
||||
//
|
||||
|
||||
#include "libcef_dll/cpptoc/dialog_handler_cpptoc.h"
|
||||
@ -30,6 +30,8 @@ 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,
|
||||
cef_string_list_t accept_extensions,
|
||||
cef_string_list_t accept_descriptions,
|
||||
cef_file_dialog_callback_t* callback) {
|
||||
shutdown_checker::AssertNotShutdown();
|
||||
|
||||
@ -49,17 +51,24 @@ dialog_handler_on_file_dialog(struct _cef_dialog_handler_t* self,
|
||||
if (!callback) {
|
||||
return 0;
|
||||
}
|
||||
// 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
|
||||
std::vector<CefString> accept_filtersList;
|
||||
transfer_string_list_contents(accept_filters, accept_filtersList);
|
||||
// Translate param: accept_extensions; type: string_vec_byref_const
|
||||
std::vector<CefString> accept_extensionsList;
|
||||
transfer_string_list_contents(accept_extensions, accept_extensionsList);
|
||||
// Translate param: accept_descriptions; type: string_vec_byref_const
|
||||
std::vector<CefString> accept_descriptionsList;
|
||||
transfer_string_list_contents(accept_descriptions, accept_descriptionsList);
|
||||
|
||||
// Execute
|
||||
bool _retval = CefDialogHandlerCppToC::Get(self)->OnFileDialog(
|
||||
CefBrowserCToCpp::Wrap(browser), mode, CefString(title),
|
||||
CefString(default_file_path), accept_filtersList,
|
||||
CefFileDialogCallbackCToCpp::Wrap(callback));
|
||||
CefString(default_file_path), accept_filtersList, accept_extensionsList,
|
||||
accept_descriptionsList, CefFileDialogCallbackCToCpp::Wrap(callback));
|
||||
|
||||
// Return type: bool
|
||||
return _retval;
|
||||
|
Reference in New Issue
Block a user