mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-02-10 00:50:38 +01:00
8e79307a62
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`
106 lines
3.6 KiB
C++
106 lines
3.6 KiB
C++
// Copyright (c) 2024 The Chromium Embedded Framework Authors. All rights
|
|
// reserved. Use of this source code is governed by a BSD-style license that
|
|
// can be found in the LICENSE file.
|
|
//
|
|
// ---------------------------------------------------------------------------
|
|
//
|
|
// This file was generated by the CEF translator tool. If making changes by
|
|
// hand only do so within the body of existing method and function
|
|
// implementations. See the translator.README.txt file in the tools directory
|
|
// for more information.
|
|
//
|
|
// $hash=3c95f12406eee58308a2c019e8081e0710769e0d$
|
|
//
|
|
|
|
#include "libcef_dll/cpptoc/dialog_handler_cpptoc.h"
|
|
|
|
#include "libcef_dll/ctocpp/browser_ctocpp.h"
|
|
#include "libcef_dll/ctocpp/file_dialog_callback_ctocpp.h"
|
|
#include "libcef_dll/shutdown_checker.h"
|
|
#include "libcef_dll/transfer_util.h"
|
|
|
|
namespace {
|
|
|
|
// MEMBER FUNCTIONS - Body may be edited by hand.
|
|
|
|
int CEF_CALLBACK
|
|
dialog_handler_on_file_dialog(struct _cef_dialog_handler_t* self,
|
|
cef_browser_t* browser,
|
|
cef_file_dialog_mode_t mode,
|
|
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();
|
|
|
|
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
|
|
|
|
DCHECK(self);
|
|
if (!self) {
|
|
return 0;
|
|
}
|
|
// Verify param: browser; type: refptr_diff
|
|
DCHECK(browser);
|
|
if (!browser) {
|
|
return 0;
|
|
}
|
|
// Verify param: callback; type: refptr_diff
|
|
DCHECK(callback);
|
|
if (!callback) {
|
|
return 0;
|
|
}
|
|
// 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, accept_extensionsList,
|
|
accept_descriptionsList, CefFileDialogCallbackCToCpp::Wrap(callback));
|
|
|
|
// Return type: bool
|
|
return _retval;
|
|
}
|
|
|
|
} // namespace
|
|
|
|
// CONSTRUCTOR - Do not edit by hand.
|
|
|
|
CefDialogHandlerCppToC::CefDialogHandlerCppToC() {
|
|
GetStruct()->on_file_dialog = dialog_handler_on_file_dialog;
|
|
}
|
|
|
|
// DESTRUCTOR - Do not edit by hand.
|
|
|
|
CefDialogHandlerCppToC::~CefDialogHandlerCppToC() {
|
|
shutdown_checker::AssertNotShutdown();
|
|
}
|
|
|
|
template <>
|
|
CefRefPtr<CefDialogHandler> CefCppToCRefCounted<
|
|
CefDialogHandlerCppToC,
|
|
CefDialogHandler,
|
|
cef_dialog_handler_t>::UnwrapDerived(CefWrapperType type,
|
|
cef_dialog_handler_t* s) {
|
|
DCHECK(false) << "Unexpected class type: " << type;
|
|
return nullptr;
|
|
}
|
|
|
|
template <>
|
|
CefWrapperType CefCppToCRefCounted<CefDialogHandlerCppToC,
|
|
CefDialogHandler,
|
|
cef_dialog_handler_t>::kWrapperType =
|
|
WT_DIALOG_HANDLER;
|