a006cf681b
* chore: bump chromium in DEPS to 91.0.4435.3 * build: add 'use_rts' definition Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2694187 * chore: update patches * chore: media_internal_resources becomes resources Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2699022 * chore: update patches * refactor: extensions::ViewType moved to mojom Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2710351 * chore: might_have_observers has been removed Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2667839 * refactor: CertVerifier is not in the network namespace anymore Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2689805 * refactor: ExtensionUserScriptManager is now UserScriptManager Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2657617 * refactor: content::SiteInstance::GetSiteForURL was removed Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2680274 * refactor: MenuItemType was moved to mojom Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2071443 * refactor: extensions::ViewType was moved to mojom Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2710351 * refacotr: grit::ResourceMap replaced with webui::ResourcePath Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2685601 * refactor: blink::MenuItem::Type was moved to mojom Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2071443 * refactor: CreateDataPipe deprecated form was removed Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2698090 * refactor: DesktopMediaList::Type replaces content::DesktopMediaType_* Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2700637 * chore: wire up activation_time in OSR Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2638372 * chore: remove deleted file from chromium_src list * chore: fix lint * update patches * chore: bump chromium in DEPS to 91.0.4438.0 * chore: bump chromium in DEPS to 91.0.4439.0 * chore: bump chromium in DEPS to 91.0.4440.0 * chore: bump chromium in DEPS to 91.0.4441.0 * chore: bump chromium in DEPS to 91.0.4442.0 * chore: bump chromium in DEPS to 91.0.4443.0 * chore: bump chromium in DEPS to 91.0.4445.0 * chore: bump chromium in DEPS to 91.0.4446.0 * chore: update patches * fixup gn check * Merge branch 'master' into roller/chromium/master * update to xcode 12.4.0 Needed because of8008deb41c
* 2752406: [LSC] Replace base::string16 with std::u16string in //ui https://chromium-review.googlesource.com/c/chromium/src/+/2752406 * 2752406: [LSC] Replace base::string16 with std::u16string in //ui https://chromium-review.googlesource.com/c/chromium/src/+/2752406 * 2752932: Associate each AwProxyingURLLoaderFactory with a frame tree node id. https://chromium-review.googlesource.com/c/chromium/src/+/2752932 * 2651385: Moving Profile::shared_cors_origin_access_list_ into //content layer. https://chromium-review.googlesource.com/c/chromium/src/+/2651385 * 2734095: Introduce StoragePartitionId type to wrap current string representation. https://chromium-review.googlesource.com/c/chromium/src/+/2734095 * chore: bump chromium in DEPS to 91.0.4448.0 * Update patches * 2743594: Remove WebSize from blink. https://chromium-review.googlesource.com/c/chromium/src/+/2743594 * 2725403: Add URLLoaderClient::OnReceiveEarlyHints() https://chromium-review.googlesource.com/c/chromium/src/+/2725403 * 2651385: Moving Profile::shared_cors_origin_access_list_ into //content layer. https://chromium-review.googlesource.com/c/chromium/src/+/2651385 * 2721718: Move HostID to extensions::mojom::HostID https://chromium-review.googlesource.com/c/chromium/src/+/2721718 * 2733070: Rename observer to URLLoaderNetworkServiceObserver https://chromium-review.googlesource.com/c/chromium/src/+/2733070 * Use nogncheck for content/browser/site_instance_impl.h This is needed because //content/browser:browser is not a visible target * 2648046: Introduce alert notification helper .app https://chromium-review.googlesource.com/c/chromium/src/+/2648046 * 2752406: [LSC] Replace base::string16 with std::u16string in //ui https://chromium-review.googlesource.com/c/chromium/src/+/2752406 * only include mac notifications on mac * add additional skipping of atk toolchain check * 2757472: Reland "Reland "[LSC] Remove base::string16 alias"" https://chromium-review.googlesource.com/c/chromium/src/+/2757472 * 2757472: Reland "Reland "[LSC] Remove base::string16 alias"" https://chromium-review.googlesource.com/c/chromium/src/+/2757472 * 2720306: [api] Remove deprecated [Shared]ArrayBuffer API https://chromium-review.googlesource.com/c/v8/v8/+/2720306 * Fixup 2721718: Move HostID to extensions::mojom::HostID * fixup 2651385: Moving Profile::shared_cors_origin_access_list_ into //content layer * Fixup 2752406: [LSC] Replace base::string16 with std::u16string in //ui * Fixup 2725403: Add URLLoaderClient::OnReceiveEarlyHints() * update node headers * chore: bump chromium in DEPS to 91.0.4449.0 * Revert "chore: bump chromium in DEPS to 91.0.4449.0" This reverts commitbccafa0289
. * 2693008: Fix loading non-system cursors on Windows on browser_tests https://chromium-review.googlesource.com/c/chromium/src/+/2693008 * 2757472: Reland "Reland "[LSC] Remove base::string16 alias"" https://chromium-review.googlesource.com/c/chromium/src/+/2757472 * undo changes to WebContentsPreferences::GetPreloadPath to fix mac build * fix StrCat issue * incantations for WebContentsPreferences::GetPreloadPath wide strings * bump nan * fix GetAsString maybe? * windows build fixes * more windows build fix * SetAppUserModelID -> wstring * upgrade nan dep in tests * lint * wstrings are cross-platform * linter * only bind setAppUserModelId on windows * fix a messed up merge * well that was an odyssey * backport fcdf35e from v8 to fix nan crash * disable typedarrays-test.js * don't defer in NSWindow creation https://chromium-review.googlesource.com/c/chromium/src/+/2707696 * use PartitionAllocator for ArrayBuffers in the main process * fix patches * chore: omit some unnecessary conversions * refactor: make LoginItemSettings::path a wstring * refactor: make ShowTaskDialog take a wstr * Revert "refactor: make LoginItemSettings::path a wstring" This reverts commit9127cff58b
. Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: John Kleinschmidt <jkleinsc@github.com> Co-authored-by: Jeremy Rose <nornagon@nornagon.net> Co-authored-by: Jeremy Rose <jeremya@chromium.org> Co-authored-by: Charles Kerr <charles@charleskerr.com>
173 lines
5.6 KiB
C++
173 lines
5.6 KiB
C++
// Copyright (c) 2014 GitHub, Inc. All rights reserved.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "shell/browser/web_dialog_helper.h"
|
|
|
|
#include <memory>
|
|
|
|
#include <string>
|
|
#include <utility>
|
|
#include <vector>
|
|
|
|
#include "base/bind.h"
|
|
#include "base/files/file_enumerator.h"
|
|
#include "base/files/file_path.h"
|
|
#include "base/strings/utf_string_conversions.h"
|
|
#include "chrome/common/pref_names.h"
|
|
#include "components/prefs/pref_service.h"
|
|
#include "content/public/browser/file_select_listener.h"
|
|
#include "content/public/browser/render_frame_host.h"
|
|
#include "content/public/browser/render_process_host.h"
|
|
#include "content/public/browser/render_view_host.h"
|
|
#include "content/public/browser/web_contents.h"
|
|
#include "net/base/mime_util.h"
|
|
#include "shell/browser/electron_browser_context.h"
|
|
#include "shell/browser/file_select_helper.h"
|
|
#include "shell/browser/native_window.h"
|
|
#include "shell/browser/ui/file_dialog.h"
|
|
|
|
using blink::mojom::FileChooserFileInfo;
|
|
using blink::mojom::FileChooserFileInfoPtr;
|
|
using blink::mojom::FileChooserParams;
|
|
using blink::mojom::NativeFileInfo;
|
|
|
|
namespace {
|
|
|
|
file_dialog::Filters GetFileTypesFromAcceptType(
|
|
const std::vector<std::u16string>& accept_types) {
|
|
file_dialog::Filters filters;
|
|
if (accept_types.empty())
|
|
return filters;
|
|
|
|
std::vector<base::FilePath::StringType> extensions;
|
|
|
|
int valid_type_count = 0;
|
|
std::string description;
|
|
|
|
for (const auto& accept_type : accept_types) {
|
|
std::string ascii_type = base::UTF16ToASCII(accept_type);
|
|
auto old_extension_size = extensions.size();
|
|
|
|
if (ascii_type[0] == '.') {
|
|
// If the type starts with a period it is assumed to be a file extension,
|
|
// like `.txt`, // so we just have to add it to the list.
|
|
base::FilePath::StringType extension(ascii_type.begin(),
|
|
ascii_type.end());
|
|
// Skip the first character.
|
|
extensions.push_back(extension.substr(1));
|
|
} else {
|
|
if (ascii_type == "image/*")
|
|
description = "Image Files";
|
|
else if (ascii_type == "audio/*")
|
|
description = "Audio Files";
|
|
else if (ascii_type == "video/*")
|
|
description = "Video Files";
|
|
|
|
// For MIME Type, `audio/*, video/*, image/*
|
|
net::GetExtensionsForMimeType(ascii_type, &extensions);
|
|
}
|
|
|
|
if (extensions.size() > old_extension_size)
|
|
valid_type_count++;
|
|
}
|
|
|
|
// If no valid extension is added, return empty filters.
|
|
if (extensions.empty())
|
|
return filters;
|
|
|
|
filters.push_back(file_dialog::Filter());
|
|
|
|
if (valid_type_count > 1 || (valid_type_count == 1 && description.empty()))
|
|
description = "Custom Files";
|
|
|
|
DCHECK(!description.empty());
|
|
filters[0].first = description;
|
|
|
|
for (const auto& extension : extensions) {
|
|
#if defined(OS_WIN)
|
|
filters[0].second.push_back(base::WideToASCII(extension));
|
|
#else
|
|
filters[0].second.push_back(extension);
|
|
#endif
|
|
}
|
|
|
|
// Allow all files when extension is specified.
|
|
filters.push_back(file_dialog::Filter());
|
|
filters.back().first = "All Files";
|
|
filters.back().second.emplace_back("*");
|
|
|
|
return filters;
|
|
}
|
|
|
|
} // namespace
|
|
|
|
namespace electron {
|
|
|
|
WebDialogHelper::WebDialogHelper(NativeWindow* window, bool offscreen)
|
|
: window_(window), offscreen_(offscreen) {}
|
|
|
|
WebDialogHelper::~WebDialogHelper() = default;
|
|
|
|
void WebDialogHelper::RunFileChooser(
|
|
content::RenderFrameHost* render_frame_host,
|
|
scoped_refptr<content::FileSelectListener> listener,
|
|
const FileChooserParams& params) {
|
|
file_dialog::DialogSettings settings;
|
|
settings.force_detached = offscreen_;
|
|
settings.filters = GetFileTypesFromAcceptType(params.accept_types);
|
|
settings.parent_window = window_;
|
|
settings.title = base::UTF16ToUTF8(params.title);
|
|
|
|
auto* fsc =
|
|
new FileSelectHelper(render_frame_host, std::move(listener), params.mode);
|
|
|
|
if (params.mode == FileChooserParams::Mode::kSave) {
|
|
settings.default_path = params.default_file_name;
|
|
fsc->ShowSaveDialog(settings);
|
|
} else {
|
|
int flags = file_dialog::OPEN_DIALOG_CREATE_DIRECTORY;
|
|
switch (params.mode) {
|
|
case FileChooserParams::Mode::kOpenMultiple:
|
|
flags |= file_dialog::OPEN_DIALOG_MULTI_SELECTIONS;
|
|
FALLTHROUGH;
|
|
case FileChooserParams::Mode::kOpen:
|
|
flags |= file_dialog::OPEN_DIALOG_OPEN_FILE;
|
|
break;
|
|
case FileChooserParams::Mode::kUploadFolder:
|
|
flags |= file_dialog::OPEN_DIALOG_OPEN_DIRECTORY;
|
|
break;
|
|
default:
|
|
NOTREACHED();
|
|
}
|
|
|
|
auto* browser_context = static_cast<electron::ElectronBrowserContext*>(
|
|
render_frame_host->GetProcess()->GetBrowserContext());
|
|
settings.default_path = browser_context->prefs()
|
|
->GetFilePath(prefs::kSelectFileLastDirectory)
|
|
.Append(params.default_file_name);
|
|
settings.properties = flags;
|
|
fsc->ShowOpenDialog(settings);
|
|
}
|
|
}
|
|
|
|
void WebDialogHelper::EnumerateDirectory(
|
|
content::WebContents* web_contents,
|
|
scoped_refptr<content::FileSelectListener> listener,
|
|
const base::FilePath& dir) {
|
|
int types = base::FileEnumerator::FILES | base::FileEnumerator::DIRECTORIES |
|
|
base::FileEnumerator::INCLUDE_DOT_DOT;
|
|
base::FileEnumerator file_enum(dir, false, types);
|
|
|
|
base::FilePath path;
|
|
std::vector<FileChooserFileInfoPtr> file_info;
|
|
while (!(path = file_enum.Next()).empty()) {
|
|
file_info.push_back(FileChooserFileInfo::NewNativeFile(
|
|
NativeFileInfo::New(path, std::u16string())));
|
|
}
|
|
|
|
listener->FileSelected(std::move(file_info), dir,
|
|
FileChooserParams::Mode::kUploadFolder);
|
|
}
|
|
|
|
} // namespace electron
|