2021-09-14 10:16:34 +00:00
|
|
|
// Copyright (c) 2021 Microsoft. All rights reserved.
|
2020-10-28 00:05:28 +00:00
|
|
|
// Use of this source code is governed by the MIT license that can be
|
|
|
|
// found in the LICENSE file.
|
|
|
|
|
2021-09-14 10:16:34 +00:00
|
|
|
#include "shell/browser/file_select_helper.h"
|
2020-10-28 00:05:28 +00:00
|
|
|
|
2021-09-14 10:16:34 +00:00
|
|
|
#include <stddef.h>
|
2020-10-28 00:05:28 +00:00
|
|
|
|
2021-09-14 10:16:34 +00:00
|
|
|
#include <memory>
|
|
|
|
#include <string>
|
|
|
|
#include <utility>
|
2020-10-28 00:05:28 +00:00
|
|
|
|
|
|
|
#include "base/files/file_util.h"
|
2023-02-03 11:43:42 +00:00
|
|
|
#include "base/functional/bind.h"
|
2021-09-14 10:16:34 +00:00
|
|
|
#include "base/memory/ptr_util.h"
|
|
|
|
#include "base/strings/string_split.h"
|
|
|
|
#include "base/strings/string_util.h"
|
2020-10-28 00:05:28 +00:00
|
|
|
#include "base/strings/utf_string_conversions.h"
|
chore: bump chromium to 92.0.4475.0 (master) (#28462)
* chore: bump chromium in DEPS to 91.0.4464.0
* chore: rebuild chromium/dcheck.patch with import-patches -3
Mechanical only; no code changes
* chore: remove content_browser_main_loop.patch
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2725153
The function being patched (BrowserMainLoop::MainMessageLoopRun()) no
longer exists.
NB: if removing this introduces regressions the likely fix will be to
add a similar patch for ShellBrowserMainParts::WillRunMainMessageLoop()
which has similar code and was added at the same time this was removed.
* chore: rebuild chromium/put_back_deleted_colors_for_autofill.patch with import-patches -3
Mechanical only; no code changes
* chore: rebuild chromium/disable_color_correct_rendering.patch with import-patches -3
Mechanical only; no code changes
* chore: rebuild chromium/eat_allow_disabling_blink_scheduler_throttling_per_renderview.patch with patch
Mechanical only; no code changes
* chore: rebuild chromium/gpu_notify_when_dxdiag_request_fails.patch with import-patches -3
Mechanical only; no code changes
* chore: rebuild chromium/ui_gtk_public_header.patch manually
no code changes
* chore: rebuild chromium/web_contents.patch with import-patches -3
Mechanical only; no code changes
* chore: remove v8/skip_global_registration_of_shared_arraybuffer_backing_stores.patch
Refs: https://chromium-review.googlesource.com/c/v8/v8/+/2763874
This patch has been merged upstream
* chore: export patches
* chore: update add_trustedauthclient_to_urlloaderfactory.patch
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2757969
Sync with removal of render_frame_id_
* chore: sync chromium/put_back_deleted_colors_for_autofill.patch
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2785841
SkColorFromColorId() no longer takes theme, scheme args
* chore: sync chromium/put_back_deleted_colors_for_autofill.patch
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2772143
Change new calls to GetDarkSchemeColor to fit our patched call signature
* chore: update add_trustedauthclient_to_urlloaderfactory.patch
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2757969
Sync with removal of render_frame_id_ in our mojom
* chore: update chromium/frame_host_manager.patch
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2740008
UrlInfo ctor now takes UrlInfo::OriginIsolationRequest instead of a bool
* chore: update chromium/revert_remove_contentrendererclient_shouldfork.patch
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2755314
Upstream has removed `history_list_length_` which we were comparing to 0
to calculate our `is_initial_navigation` bool when calling ShouldFork().
ShouldFork() is ours and none of the code paths actually use that param,
so this commit removes it altogether.
* chore: update permissions_to_register
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2789074
Replace all uses of APIPermission::ID enum with Mojo type
* refactor: update return type of PreMainMessageLoopRun()
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2725153
Used to return void; now returns an int errorcode.
Note: 2725153 also has some nice doc updates about Browser's "stages"
* refactor: sync ElectronBrowserMainParts to MainParts changes
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2725153
RunMainMessageLoopParts has been replaced with WillRunMainMessageLoop
so `BrowserMainLoop::result_code_` is no longer available to us for our
exit_code_ pointer.
This variable held a dual role: (1) of course, hold the exit code, but
also (2) was a nullptr before the message loop was ready, indicating to
anyone calling SetExitCode() that we were still in startup and could
just exit() without any extra steps. exit_code_ still fulfills these two
roles but is now a base::Optional.
* chore: update ElectronBrowserMainParts::PreDefaultMainMessageLoopRun
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2725153
BrowserMainParts::BrowsePreDefaultMainMesssageLoopRun() has been
removed; move that work to the new WillRunMainMessageLoop().
* refactor: stop using CallbackList; it has been removed.
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2785973
* refactor: update use of threadpools.
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2773408
The upstream code is still in flux (e.g. reverts and re-lands) but the
tl;dr for this commit is (1) include thread_pool.h if you're using it
and (2) don't instantiate pools directly.
* refactor: remove routing_id from CreateLoaderAndStart
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2762858
NB: One logic branch in ProxyingURLLoaderFactory::CreateLoaderAndStart
calls std::make_unique<InProgressRequest>, which needs a routing_id.
This PR uses the member field `routing_id_` since there's no longer one
being passed into CreateLoaderAndStart.
* refactor: sync to upstream ParittionOptions churn
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2771318
PartitionOptions' enums have changed.
* refactor: update Manifest::Location usage
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2771320
tldr: s/Manifest::FOO/ManifestLocation::kFoo/
* chore: bump chromium in DEPS to 91.0.4465.0
* update patches
* refactor: update extensions::Manifest to upstream
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2771320
- extensions::Manifest::COMPONENT
+ extensions::mojom::ManifestLocation::kExternalComponent
* refactor: sync with upstream UrlInfo ctor changes
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2740008
UrlInfo ctor now takes UrlInfo::OriginIsolationRequest instead of a bool
* chore: update invocation of convert_protocol_to_json.py
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2792623
python3 is being used in parts of the upstream build, but the copy of
convert_protocol_to_json.py invoked in v8/third_party/inspector_protocol
is not python3-friendly. Node has a py2+3-friendly version of it in its
tools directory, so call it instead.
* chore: use extensions::mojom::APIPermissionID
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2791122
tldr:
- extensions::APIPermission::kFoo
+ extensions::mojom::APIPermissionID::kFoo
* chore: Remove support for TLS1.0/1.1 in SSLVersionMin policy
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2765737
Remove TLS v1.0 & 1.1 from our SSLProtocolVersionFromString() function.
This is the same change made upstream at
https://chromium-review.googlesource.com/c/chromium/src/+/2765737/8/chrome/browser/ssl/ssl_config_service_manager_pref.cc
* fixup! chore: update ElectronBrowserMainParts::PreDefaultMainMessageLoopRun
* chore: Use IDType for permission change subscriptions.
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2791431
tldr: {Subscribe,Unsubscribe}PermissionStatusChange's tag type used to
be an int; now it's the new SubscriptionId type (which is an IdType64).
* chore: sync PowerMonitor code to upstream refactor
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2752635
tldr: PowerMonitor has been split into PowerStateObserver,
PowerSuspendObserver, and PowerThermalObserver to reduce number of tasks
posted to consumers who only need notifications for one of those things
instead of all of them.
* chore: use PartitionOptions's new Cookies field
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2771318
* Revert "refactor: remove routing_id from CreateLoaderAndStart"
This reverts commit 8c9773b87a3c84f9073a47089eb2b6889d745245.
8c9773b was only a partial fix; reverting to start & try again.
* update patches
* chore: bump chromium in DEPS to 91.0.4466.0
* chore: update chromium/accelerator.patch
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2795472
tldr: sync patch with upstream renamed variable & macro names.
* chore: update chromium/gtk_visibility.patch
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2796200
tldr: no code changes; just updating the diff to apply cleanly.
note: ooh upstream Wayland hacking!
* chore: update chromium/picture-in-picture.patch
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2710023
tldr: no code changes; just updating the diff to apply cleanly.
* chore: update chromium/worker_feat_add_hook_to_notify_script_ready.patch
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2775573
tldr: no code changes; just updating the diff to apply cleanly.
* chore: export_all_patches
* chore: update chromium/feat_add_set_theme_source_to_allow_apps_to.patch
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2796511
tldr: NotifyObservers has been renamed to NotifyOnNativeThemeUpdated,
so update the invocation in our patch.
* chore: update ElectronBrowserClient w/upstream API
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2797454
tldr: GetDevToolsManagerDelegate() was returning an owned raw pointer.
Replaced it with CreateDevToolsManagerDelegate() which uses unique_ptr<>.
* chore: handle new content::PermissionType::FILE_HANDLING in toV8()
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2762201
`file-handling` string confirmed in https://chromium-review.googlesource.com/c/chromium/src/+/2762201/18/chrome/browser/ui/webui/settings/site_settings_helper.cc
* refactor: remove routing_id from CreateLoaderAndStart pt 1
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2762858
Part 1: the easiest ones
* 2796724: Support Python3
https://chromium-review.googlesource.com/c/infra/luci/python-adb/+/2796724
* chore: bump chromium in DEPS to 91.0.4468.0
* 2668974: WebShare: Implement SharingServicePicker
https://chromium-review.googlesource.com/c/chromium/src/+/2668974
* 2802766: Apply modernize-make-unique to media/
https://chromium-review.googlesource.com/c/chromium/src/+/2802766
* 2802823: Apply modernize-make-unique to gpu/
https://chromium-review.googlesource.com/c/chromium/src/+/2802823
* 2803041: Apply modernize-make-unique to remaining files
https://chromium-review.googlesource.com/c/chromium/src/+/2803041
* 2798873: Convert GtkKeyBindingsHandler build checks to runtime checks
https://chromium-review.googlesource.com/c/chromium/src/+/2798873
* 2733595: [ch-r] Parse ACCEPT_CH H2/3 frame and restart with new headers if needed
https://chromium-review.googlesource.com/c/chromium/src/+/2733595
* chore: update patch indices
* 2795107: Remove unused PermissionRequest IDs.
https://chromium-review.googlesource.com/c/chromium/src/+/2795107
* chore: bump chromium in DEPS to 91.0.4469.0
* chore: fixup patch indices
* chore: bump chromium in DEPS to 91.0.4469.5
* PiP 1.5: Add microphone, camera, and hang up buttons to the PiP window
https://chromium-review.googlesource.com/c/chromium/src/+/2710023
* fixup! refactor: remove routing_id from CreateLoaderAndStart
* refactor: use URLLoaderNetworkServiceObserver for auth requests from SimpleURLLoader
* fixup! chore: fixup patch indices
* 2724817: Expand scope of wasm-eval to all URLs
https://chromium-review.googlesource.com/c/chromium/src/+/2724817
* Fixup patch after rebase
* chore: bump chromium in DEPS to 91.0.4472.0
* 2797341: [ozone/x11] Enabled the global shortcut listener.
https://chromium-review.googlesource.com/c/chromium/src/+/2797341
* 2805553: Reland Add GTK ColorMixers to ColorPipeline P1
https://chromium-review.googlesource.com/c/chromium/src/+/2805553
* 2804366: PiP 1.5: Label back to tab button with origin and center it
https://chromium-review.googlesource.com/c/chromium/src/+/2804366
* 2784730: Fix crash on AX mode change in NativeViewHost without a Widget
https://chromium-review.googlesource.com/c/chromium/src/+/2784730
* chore: update patch indices
* 2810174: Add PdfAnnotationsEnabled policy.
https://chromium-review.googlesource.com/c/chromium/src/+/2810174
* 2807829: Allow capturers to indicate if they want a WakeLock or not.
https://chromium-review.googlesource.com/c/chromium/src/+/2807829
* chore: bump chromium in DEPS to 92.0.4473.0
* chore: bump chromium in DEPS to 92.0.4474.0
* chore: bump chromium in DEPS to 92.0.4475.0
* chore: update patches
* chore: updates patches
* chore: update is_media_key patch to handle new ozone impl
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2797341
* fix: ExecuteJavascript requests now need to be flagged as non-bf-aware
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2787195
* chore: icon_util_x11 is now icon_util_linux
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2791362
* build: update sysroots
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2628496
* build: fix missing symbols on linux build
* use_ozone and use_x11 are not exclusive
* new button view to build for pip
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2797341
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2804366
* chore: fix broken gtk_util color patch
* chore: remove patch conflict
* build: update linux manifests
* chore: build bttlb on all platforms for pip
* chore: add thread_pool include for views delegate win
* chore: fix lint
* chore: add node patches for V8 changes
* build: add missing base include on windows
* fix: update frame host manager patch for new state transitions
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2714464
* chore: update windows zip manifests
* chore: update mac zip manifests
* chore: fix patch linting
* refactor: implement missing URLLoaderNetworkServiceObserver methods
It is against The Mojo Rules to leave hanging callbacks. These always
have to be called.
Refs: https://github.com/electron/electron/commit/186528aab9f8e29d658f07d220bb7f627980edda
* spec: fix locale test on local linux
* fix: pass the exit code correctly in new PreMainMessageLoopRun
Refs: https://github.com/electron/electron/commit/2622e91c4493ceb032e2f80cb484885bb8f97475
* fix: ensure we early-exit when request_handler_ is not provided
Refs: https://github.com/electron/electron/commit/93077afbfb6db248a0c0cc447d7ad2c9ccfda1d5
* fix: strongly set result_code in the BrowserMainLoop
* fix: invalid usage of non-targetted PostTask
You must always either use a host threadpool or specify a target
thread. In this case we did neither after this refactor.
Refs: https://github.com/electron/electron/pull/28462/commits/4e33ee0ad35a710bd34641cb0376bdee6aea2d1f
* chore: fix gn check
* chore: remove stray .rej files in patch
* chore: add mojo error code to url loader failure
* build: ensure CI is truthy in arm test env
* fix: handle windowCaptureMacV2 being enabled when fetching media source id
Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2709931
Co-authored-by: Charles Kerr <charles@charleskerr.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
Co-authored-by: deepak1556 <hop2deep@gmail.com>
Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com>
Co-authored-by: Samuel Attard <sattard@slack-corp.com>
2021-04-15 17:44:35 +00:00
|
|
|
#include "base/task/thread_pool.h"
|
2021-09-14 10:16:34 +00:00
|
|
|
#include "base/threading/hang_watcher.h"
|
|
|
|
#include "build/build_config.h"
|
|
|
|
#include "chrome/browser/browser_process.h"
|
|
|
|
#include "chrome/browser/platform_util.h"
|
2020-10-28 00:05:28 +00:00
|
|
|
#include "chrome/common/pref_names.h"
|
2022-04-06 16:34:35 +00:00
|
|
|
#include "chrome/grit/generated_resources.h"
|
2020-10-28 00:05:28 +00:00
|
|
|
#include "components/prefs/pref_service.h"
|
2021-09-14 10:16:34 +00:00
|
|
|
#include "content/public/browser/browser_task_traits.h"
|
|
|
|
#include "content/public/browser/browser_thread.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/web_contents.h"
|
|
|
|
#include "net/base/filename_util.h"
|
|
|
|
#include "net/base/mime_util.h"
|
|
|
|
#include "shell/browser/api/electron_api_web_contents.h"
|
2020-10-28 00:05:28 +00:00
|
|
|
#include "shell/browser/electron_browser_context.h"
|
2021-09-14 10:16:34 +00:00
|
|
|
#include "shell/browser/native_window.h"
|
|
|
|
#include "ui/base/l10n/l10n_util.h"
|
|
|
|
#include "ui/shell_dialogs/select_file_policy.h"
|
|
|
|
#include "ui/shell_dialogs/selected_file_info.h"
|
2020-10-28 00:05:28 +00:00
|
|
|
|
|
|
|
using blink::mojom::FileChooserFileInfo;
|
|
|
|
using blink::mojom::FileChooserFileInfoPtr;
|
|
|
|
using blink::mojom::FileChooserParams;
|
2021-09-14 10:16:34 +00:00
|
|
|
using blink::mojom::FileChooserParamsPtr;
|
|
|
|
using content::BrowserThread;
|
|
|
|
using content::WebContents;
|
2020-10-28 00:05:28 +00:00
|
|
|
|
|
|
|
namespace {
|
2021-09-14 10:16:34 +00:00
|
|
|
|
2020-10-28 00:05:28 +00:00
|
|
|
void DeleteFiles(std::vector<base::FilePath> paths) {
|
|
|
|
for (auto& file_path : paths)
|
|
|
|
base::DeleteFile(file_path);
|
|
|
|
}
|
|
|
|
|
2021-09-14 10:16:34 +00:00
|
|
|
} // namespace
|
2020-10-28 00:05:28 +00:00
|
|
|
|
2021-09-14 10:16:34 +00:00
|
|
|
struct FileSelectHelper::ActiveDirectoryEnumeration {
|
|
|
|
explicit ActiveDirectoryEnumeration(const base::FilePath& path)
|
|
|
|
: path_(path) {}
|
|
|
|
|
|
|
|
std::unique_ptr<net::DirectoryLister> lister_;
|
|
|
|
const base::FilePath path_;
|
|
|
|
std::vector<base::FilePath> results_;
|
|
|
|
};
|
|
|
|
|
|
|
|
FileSelectHelper::FileSelectHelper()
|
|
|
|
: render_frame_host_(nullptr),
|
|
|
|
web_contents_(nullptr),
|
|
|
|
dialog_type_(ui::SelectFileDialog::SELECT_OPEN_FILE),
|
|
|
|
dialog_mode_(FileChooserParams::Mode::kOpen) {}
|
|
|
|
|
|
|
|
FileSelectHelper::~FileSelectHelper() {
|
|
|
|
// There may be pending file dialogs, we need to tell them that we've gone
|
|
|
|
// away so they don't try and call back to us.
|
2022-10-17 14:22:24 +00:00
|
|
|
if (select_file_dialog_)
|
2021-09-14 10:16:34 +00:00
|
|
|
select_file_dialog_->ListenerDestroyed();
|
|
|
|
}
|
2020-10-28 00:05:28 +00:00
|
|
|
|
2024-01-11 06:33:40 +00:00
|
|
|
void FileSelectHelper::FileSelected(const ui::SelectedFileInfo& file,
|
chore: bump chromium to 128.0.6611.0 (32-x-y) (#43017)
* chore: bump chromium to 128.0.6611.0 (main) (#42779)
* chore: bump chromium in DEPS to 128.0.6577.0
* chore: bump chromium in DEPS to 128.0.6579.0
* 5675706: Reland "Reland "Reland "Reland "Add toolchains without PartitionAlloc-Everywhere for dump_syms et al""""
https://chromium-review.googlesource.com/c/chromium/src/+/5675706
* 5668597: [PDF Ink Signatures] Prompt download menu on save when there are edits
https://chromium-review.googlesource.com/c/chromium/src/+/5668597
* 5677014: Reland "Pull data_sharing_sdk from CIPD"
https://chromium-review.googlesource.com/c/chromium/src/+/5677014
* chore: fixup patch indices
* chore: bump chromium in DEPS to 128.0.6581.0
* chore: bump chromium in DEPS to 128.0.6583.0
* update patches
* 5455480: [Extensions] Allow service worker requests to continue without a cert
https://chromium-review.googlesource.com/c/chromium/src/+/5455480
* try to get some debugging output from script/push-patch.js
* chore: bump chromium in DEPS to 128.0.6585.0
* chore: bump chromium in DEPS to 128.0.6587.0
* update patches
* chore: bump chromium in DEPS to 128.0.6589.0
* more patch work
* maybe over here?
* chore: update patches
* 5673207: [HTTPS Upgrades] Disable in captive portal login webview
https://chromium-review.googlesource.com/c/chromium/src/+/5673207
* 5636785: Extensions: WAR: manifest.json's use_dynamic_url requires a dynamic url
https://chromium-review.googlesource.com/c/chromium/src/+/5636785
* chore: bump chromium in DEPS to 128.0.6591.0
* 5665458: Trigger WN2 page when feature is enabled
https://chromium-review.googlesource.com/c/chromium/src/+/5665458
* update patches
* chore: bump chromium in DEPS to 128.0.6593.0
* chore: bump chromium in DEPS to 128.0.6595.0
* chore: bump chromium in DEPS to 128.0.6597.0
* (patch update) 5694586: [compile hints] Remove the usage of v8::Isolate::SetJavaScriptCompileHintsMagicEnabledCallback API
https://chromium-review.googlesource.com/c/chromium/src/+/5694586
* update patches
* 5691287: Reland "Change blink::WebKeyboardEvent to use std::array in is members"
https://chromium-review.googlesource.com/c/chromium/src/+/5691287
The code changed here is modeled after code in `content/renderer/pepper/event_conversion.cc` that was also modified in this CL, so I took the same approach.
* 5529018: Cleanup EnableWebHidOnExtensionServiceWorker flag
https://chromium-review.googlesource.com/c/chromium/src/+/5529018
* 5526324: [Code Health] Add deprecation comment for base::SupportsWeakPtr.
https://chromium-review.googlesource.com/c/chromium/src/+/5526324
Note that this CL actually does make `SupportsWeakPtr` strictly restricted to existing implementations, no new ones. We could add a patch to add ourselves to this list, but it looks like we'll have to refactor this anyways in the near future. Since the refactor seems straightforward, let's try that first.
* chore: bump chromium in DEPS to 128.0.6598.0
* chore: update patches
* 5704737: Rename ExclusiveAccessContext::GetActiveWebContents to avoid conflict
https://chromium-review.googlesource.com/c/chromium/src/+/5704737
* chore: bump chromium in DEPS to 128.0.6601.0
* chore: update patches
* Add `base::StringPiece` header includes
Chromium is working on replacing `base::StringPiece` with `std::string_view`. (See the Chromium Bug below.) They're currently running mass codemods (across many multiple changes) to replace uses of `StringPiece` with `string_view`, including removing the header include for `StringPiece` in those files. This cascades down to our files that were implicitly depending on those includes through some other include.
They're on track to eventually deprecate and remove `StringPiece` so our code should be converted, but that can be done as an upgrade follow-up task. For now, adding the header back to files that need it should suffice for minimal upgrade changes.
Chromium Bug: https://issues.chromium.org/issues/40506050
* 5702737: GlobalRequestID: Avoid unwanted inlining and narrowing int conversions
https://chromium-review.googlesource.com/c/chromium/src/+/5702737
contender for smallest commit 2024
* 5706534: Rename GlobalFeatures to GlobalDesktopFeatures.
https://chromium-review.googlesource.com/c/chromium/src/+/5706534
* 5691321: ui: remove params variants of SelectFile listener functions
https://chromium-review.googlesource.com/c/chromium/src/+/5691321
* 5714949: [Extensions] Display re-enable dialog for MV2 disabled stage
https://chromium-review.googlesource.com/c/chromium/src/+/5714949
* chore: update libc++ filenames
* patch: disable scope reuse & associated dchecks in v8 (hopefully temp, upgrade follow-up)
* fixup! Add `base::StringPiece` header includes
* update MAS patch
5710330: Add crash keys to debug NativeWidgetMacNSWindowBorderlessFrame exception
https://chromium-review.googlesource.com/c/chromium/src/+/5710330
* chore: bump chromium in DEPS to 128.0.6603.0
* chore: update patches
* 5713258: Reland "Preparation for decoupling creation/initialization of context"
https://chromium-review.googlesource.com/c/chromium/src/+/5713258
When destroying a context, it must already be shutdown, and this change enforces it with a new CHECK.
We were overriding `BrowserContextKeyedServiceFactory::BrowserContextShutdown` with an empty implementation, which differed from the default implementation that notifies the `KeyedServiceFactory` that the context has shutdown. Since we were missing this notification, the CHECK would later trip when the service was being destoryed because it was not registered as shutdown when it was shutdown.
* chore: bump chromium in DEPS to 128.0.6605.2
* chore: update patches
* refactor: linux open/save dialog patch
Our existing implementation was relying on an opaque `void* params` parameter that was passed through `ui::SelectFileDialog`.
Recently, that parameter has been getting removed:
- 5691321: ui: remove params variants of SelectFile listener functions | https://chromium-review.googlesource.com/c/chromium/src/+/5691321
- 5709097: ui: remove SelectFileDialog impl params | https://chromium-review.googlesource.com/c/chromium/src/+/5709097
- https://issues.chromium.org/issues/340178601 "reconsider SelectFileDialog"
This restructures the patch to work with mostly the same mechanics, but directly on the `ui::SelectFileDialog` object. This nets us some wins in terms of a smaller patch.
* 5713262: DevTools UI binding AIDA client event returns response
https://chromium-review.googlesource.com/c/chromium/src/+/5713262
* fixup! refactor: linux open/save dialog patch
* chore: bump chromium in DEPS to 128.0.6606.0
* chore: update patches
* fixup! refactor: linux open/save dialog patch
* chore: bump chromium in DEPS to 128.0.6607.0
* chore: update printing.patch
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5722937
* fix: pwd error in electron-test, nan-test
fix: unshallow depot_tools before 3-way apply
* chore: e patches all
* fixup! fix: pwd error in electron-test, nan-test
* chore: bump chromium in DEPS to 128.0.6609.0
* chore: bump chromium in DEPS to 128.0.6611.0
* chore: update patches
* chore: update libcxx filenames
---------
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
Co-authored-by: Jeremy Rose <nornagon@nornagon.net>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: clavin <clavin@electronjs.org>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
Co-authored-by: Alice Zhao <alice@makenotion.com>
* chore: delete duplicate declaration from merge conflict
* chore: bump chromium in DEPS to 128.0.6613.7
* Revert "chore: bump chromium in DEPS to 128.0.6613.7"
This reverts commit 78047428269c79d4d3532619daf0f07e307f4dbc.
---------
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
Co-authored-by: Jeremy Rose <nornagon@nornagon.net>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: clavin <clavin@electronjs.org>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
2024-07-25 09:24:11 +00:00
|
|
|
int index) {
|
2021-09-14 10:16:34 +00:00
|
|
|
if (!render_frame_host_) {
|
|
|
|
RunFileChooserEnd();
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
const base::FilePath& path = file.local_path;
|
|
|
|
if (dialog_type_ == ui::SelectFileDialog::SELECT_UPLOAD_FOLDER) {
|
|
|
|
StartNewEnumeration(path);
|
|
|
|
return;
|
|
|
|
}
|
2020-10-28 00:05:28 +00:00
|
|
|
|
2021-09-14 10:16:34 +00:00
|
|
|
std::vector<ui::SelectedFileInfo> files;
|
|
|
|
files.push_back(file);
|
2020-10-28 00:05:28 +00:00
|
|
|
|
chore: bump chromium to 128.0.6611.0 (32-x-y) (#43017)
* chore: bump chromium to 128.0.6611.0 (main) (#42779)
* chore: bump chromium in DEPS to 128.0.6577.0
* chore: bump chromium in DEPS to 128.0.6579.0
* 5675706: Reland "Reland "Reland "Reland "Add toolchains without PartitionAlloc-Everywhere for dump_syms et al""""
https://chromium-review.googlesource.com/c/chromium/src/+/5675706
* 5668597: [PDF Ink Signatures] Prompt download menu on save when there are edits
https://chromium-review.googlesource.com/c/chromium/src/+/5668597
* 5677014: Reland "Pull data_sharing_sdk from CIPD"
https://chromium-review.googlesource.com/c/chromium/src/+/5677014
* chore: fixup patch indices
* chore: bump chromium in DEPS to 128.0.6581.0
* chore: bump chromium in DEPS to 128.0.6583.0
* update patches
* 5455480: [Extensions] Allow service worker requests to continue without a cert
https://chromium-review.googlesource.com/c/chromium/src/+/5455480
* try to get some debugging output from script/push-patch.js
* chore: bump chromium in DEPS to 128.0.6585.0
* chore: bump chromium in DEPS to 128.0.6587.0
* update patches
* chore: bump chromium in DEPS to 128.0.6589.0
* more patch work
* maybe over here?
* chore: update patches
* 5673207: [HTTPS Upgrades] Disable in captive portal login webview
https://chromium-review.googlesource.com/c/chromium/src/+/5673207
* 5636785: Extensions: WAR: manifest.json's use_dynamic_url requires a dynamic url
https://chromium-review.googlesource.com/c/chromium/src/+/5636785
* chore: bump chromium in DEPS to 128.0.6591.0
* 5665458: Trigger WN2 page when feature is enabled
https://chromium-review.googlesource.com/c/chromium/src/+/5665458
* update patches
* chore: bump chromium in DEPS to 128.0.6593.0
* chore: bump chromium in DEPS to 128.0.6595.0
* chore: bump chromium in DEPS to 128.0.6597.0
* (patch update) 5694586: [compile hints] Remove the usage of v8::Isolate::SetJavaScriptCompileHintsMagicEnabledCallback API
https://chromium-review.googlesource.com/c/chromium/src/+/5694586
* update patches
* 5691287: Reland "Change blink::WebKeyboardEvent to use std::array in is members"
https://chromium-review.googlesource.com/c/chromium/src/+/5691287
The code changed here is modeled after code in `content/renderer/pepper/event_conversion.cc` that was also modified in this CL, so I took the same approach.
* 5529018: Cleanup EnableWebHidOnExtensionServiceWorker flag
https://chromium-review.googlesource.com/c/chromium/src/+/5529018
* 5526324: [Code Health] Add deprecation comment for base::SupportsWeakPtr.
https://chromium-review.googlesource.com/c/chromium/src/+/5526324
Note that this CL actually does make `SupportsWeakPtr` strictly restricted to existing implementations, no new ones. We could add a patch to add ourselves to this list, but it looks like we'll have to refactor this anyways in the near future. Since the refactor seems straightforward, let's try that first.
* chore: bump chromium in DEPS to 128.0.6598.0
* chore: update patches
* 5704737: Rename ExclusiveAccessContext::GetActiveWebContents to avoid conflict
https://chromium-review.googlesource.com/c/chromium/src/+/5704737
* chore: bump chromium in DEPS to 128.0.6601.0
* chore: update patches
* Add `base::StringPiece` header includes
Chromium is working on replacing `base::StringPiece` with `std::string_view`. (See the Chromium Bug below.) They're currently running mass codemods (across many multiple changes) to replace uses of `StringPiece` with `string_view`, including removing the header include for `StringPiece` in those files. This cascades down to our files that were implicitly depending on those includes through some other include.
They're on track to eventually deprecate and remove `StringPiece` so our code should be converted, but that can be done as an upgrade follow-up task. For now, adding the header back to files that need it should suffice for minimal upgrade changes.
Chromium Bug: https://issues.chromium.org/issues/40506050
* 5702737: GlobalRequestID: Avoid unwanted inlining and narrowing int conversions
https://chromium-review.googlesource.com/c/chromium/src/+/5702737
contender for smallest commit 2024
* 5706534: Rename GlobalFeatures to GlobalDesktopFeatures.
https://chromium-review.googlesource.com/c/chromium/src/+/5706534
* 5691321: ui: remove params variants of SelectFile listener functions
https://chromium-review.googlesource.com/c/chromium/src/+/5691321
* 5714949: [Extensions] Display re-enable dialog for MV2 disabled stage
https://chromium-review.googlesource.com/c/chromium/src/+/5714949
* chore: update libc++ filenames
* patch: disable scope reuse & associated dchecks in v8 (hopefully temp, upgrade follow-up)
* fixup! Add `base::StringPiece` header includes
* update MAS patch
5710330: Add crash keys to debug NativeWidgetMacNSWindowBorderlessFrame exception
https://chromium-review.googlesource.com/c/chromium/src/+/5710330
* chore: bump chromium in DEPS to 128.0.6603.0
* chore: update patches
* 5713258: Reland "Preparation for decoupling creation/initialization of context"
https://chromium-review.googlesource.com/c/chromium/src/+/5713258
When destroying a context, it must already be shutdown, and this change enforces it with a new CHECK.
We were overriding `BrowserContextKeyedServiceFactory::BrowserContextShutdown` with an empty implementation, which differed from the default implementation that notifies the `KeyedServiceFactory` that the context has shutdown. Since we were missing this notification, the CHECK would later trip when the service was being destoryed because it was not registered as shutdown when it was shutdown.
* chore: bump chromium in DEPS to 128.0.6605.2
* chore: update patches
* refactor: linux open/save dialog patch
Our existing implementation was relying on an opaque `void* params` parameter that was passed through `ui::SelectFileDialog`.
Recently, that parameter has been getting removed:
- 5691321: ui: remove params variants of SelectFile listener functions | https://chromium-review.googlesource.com/c/chromium/src/+/5691321
- 5709097: ui: remove SelectFileDialog impl params | https://chromium-review.googlesource.com/c/chromium/src/+/5709097
- https://issues.chromium.org/issues/340178601 "reconsider SelectFileDialog"
This restructures the patch to work with mostly the same mechanics, but directly on the `ui::SelectFileDialog` object. This nets us some wins in terms of a smaller patch.
* 5713262: DevTools UI binding AIDA client event returns response
https://chromium-review.googlesource.com/c/chromium/src/+/5713262
* fixup! refactor: linux open/save dialog patch
* chore: bump chromium in DEPS to 128.0.6606.0
* chore: update patches
* fixup! refactor: linux open/save dialog patch
* chore: bump chromium in DEPS to 128.0.6607.0
* chore: update printing.patch
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5722937
* fix: pwd error in electron-test, nan-test
fix: unshallow depot_tools before 3-way apply
* chore: e patches all
* fixup! fix: pwd error in electron-test, nan-test
* chore: bump chromium in DEPS to 128.0.6609.0
* chore: bump chromium in DEPS to 128.0.6611.0
* chore: update patches
* chore: update libcxx filenames
---------
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
Co-authored-by: Jeremy Rose <nornagon@nornagon.net>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: clavin <clavin@electronjs.org>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
Co-authored-by: Alice Zhao <alice@makenotion.com>
* chore: delete duplicate declaration from merge conflict
* chore: bump chromium in DEPS to 128.0.6613.7
* Revert "chore: bump chromium in DEPS to 128.0.6613.7"
This reverts commit 78047428269c79d4d3532619daf0f07e307f4dbc.
---------
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
Co-authored-by: Jeremy Rose <nornagon@nornagon.net>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: clavin <clavin@electronjs.org>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
2024-07-25 09:24:11 +00:00
|
|
|
MultiFilesSelected(files);
|
2021-09-14 10:16:34 +00:00
|
|
|
}
|
2020-10-28 00:05:28 +00:00
|
|
|
|
2021-09-14 10:16:34 +00:00
|
|
|
void FileSelectHelper::MultiFilesSelected(
|
chore: bump chromium to 128.0.6611.0 (32-x-y) (#43017)
* chore: bump chromium to 128.0.6611.0 (main) (#42779)
* chore: bump chromium in DEPS to 128.0.6577.0
* chore: bump chromium in DEPS to 128.0.6579.0
* 5675706: Reland "Reland "Reland "Reland "Add toolchains without PartitionAlloc-Everywhere for dump_syms et al""""
https://chromium-review.googlesource.com/c/chromium/src/+/5675706
* 5668597: [PDF Ink Signatures] Prompt download menu on save when there are edits
https://chromium-review.googlesource.com/c/chromium/src/+/5668597
* 5677014: Reland "Pull data_sharing_sdk from CIPD"
https://chromium-review.googlesource.com/c/chromium/src/+/5677014
* chore: fixup patch indices
* chore: bump chromium in DEPS to 128.0.6581.0
* chore: bump chromium in DEPS to 128.0.6583.0
* update patches
* 5455480: [Extensions] Allow service worker requests to continue without a cert
https://chromium-review.googlesource.com/c/chromium/src/+/5455480
* try to get some debugging output from script/push-patch.js
* chore: bump chromium in DEPS to 128.0.6585.0
* chore: bump chromium in DEPS to 128.0.6587.0
* update patches
* chore: bump chromium in DEPS to 128.0.6589.0
* more patch work
* maybe over here?
* chore: update patches
* 5673207: [HTTPS Upgrades] Disable in captive portal login webview
https://chromium-review.googlesource.com/c/chromium/src/+/5673207
* 5636785: Extensions: WAR: manifest.json's use_dynamic_url requires a dynamic url
https://chromium-review.googlesource.com/c/chromium/src/+/5636785
* chore: bump chromium in DEPS to 128.0.6591.0
* 5665458: Trigger WN2 page when feature is enabled
https://chromium-review.googlesource.com/c/chromium/src/+/5665458
* update patches
* chore: bump chromium in DEPS to 128.0.6593.0
* chore: bump chromium in DEPS to 128.0.6595.0
* chore: bump chromium in DEPS to 128.0.6597.0
* (patch update) 5694586: [compile hints] Remove the usage of v8::Isolate::SetJavaScriptCompileHintsMagicEnabledCallback API
https://chromium-review.googlesource.com/c/chromium/src/+/5694586
* update patches
* 5691287: Reland "Change blink::WebKeyboardEvent to use std::array in is members"
https://chromium-review.googlesource.com/c/chromium/src/+/5691287
The code changed here is modeled after code in `content/renderer/pepper/event_conversion.cc` that was also modified in this CL, so I took the same approach.
* 5529018: Cleanup EnableWebHidOnExtensionServiceWorker flag
https://chromium-review.googlesource.com/c/chromium/src/+/5529018
* 5526324: [Code Health] Add deprecation comment for base::SupportsWeakPtr.
https://chromium-review.googlesource.com/c/chromium/src/+/5526324
Note that this CL actually does make `SupportsWeakPtr` strictly restricted to existing implementations, no new ones. We could add a patch to add ourselves to this list, but it looks like we'll have to refactor this anyways in the near future. Since the refactor seems straightforward, let's try that first.
* chore: bump chromium in DEPS to 128.0.6598.0
* chore: update patches
* 5704737: Rename ExclusiveAccessContext::GetActiveWebContents to avoid conflict
https://chromium-review.googlesource.com/c/chromium/src/+/5704737
* chore: bump chromium in DEPS to 128.0.6601.0
* chore: update patches
* Add `base::StringPiece` header includes
Chromium is working on replacing `base::StringPiece` with `std::string_view`. (See the Chromium Bug below.) They're currently running mass codemods (across many multiple changes) to replace uses of `StringPiece` with `string_view`, including removing the header include for `StringPiece` in those files. This cascades down to our files that were implicitly depending on those includes through some other include.
They're on track to eventually deprecate and remove `StringPiece` so our code should be converted, but that can be done as an upgrade follow-up task. For now, adding the header back to files that need it should suffice for minimal upgrade changes.
Chromium Bug: https://issues.chromium.org/issues/40506050
* 5702737: GlobalRequestID: Avoid unwanted inlining and narrowing int conversions
https://chromium-review.googlesource.com/c/chromium/src/+/5702737
contender for smallest commit 2024
* 5706534: Rename GlobalFeatures to GlobalDesktopFeatures.
https://chromium-review.googlesource.com/c/chromium/src/+/5706534
* 5691321: ui: remove params variants of SelectFile listener functions
https://chromium-review.googlesource.com/c/chromium/src/+/5691321
* 5714949: [Extensions] Display re-enable dialog for MV2 disabled stage
https://chromium-review.googlesource.com/c/chromium/src/+/5714949
* chore: update libc++ filenames
* patch: disable scope reuse & associated dchecks in v8 (hopefully temp, upgrade follow-up)
* fixup! Add `base::StringPiece` header includes
* update MAS patch
5710330: Add crash keys to debug NativeWidgetMacNSWindowBorderlessFrame exception
https://chromium-review.googlesource.com/c/chromium/src/+/5710330
* chore: bump chromium in DEPS to 128.0.6603.0
* chore: update patches
* 5713258: Reland "Preparation for decoupling creation/initialization of context"
https://chromium-review.googlesource.com/c/chromium/src/+/5713258
When destroying a context, it must already be shutdown, and this change enforces it with a new CHECK.
We were overriding `BrowserContextKeyedServiceFactory::BrowserContextShutdown` with an empty implementation, which differed from the default implementation that notifies the `KeyedServiceFactory` that the context has shutdown. Since we were missing this notification, the CHECK would later trip when the service was being destoryed because it was not registered as shutdown when it was shutdown.
* chore: bump chromium in DEPS to 128.0.6605.2
* chore: update patches
* refactor: linux open/save dialog patch
Our existing implementation was relying on an opaque `void* params` parameter that was passed through `ui::SelectFileDialog`.
Recently, that parameter has been getting removed:
- 5691321: ui: remove params variants of SelectFile listener functions | https://chromium-review.googlesource.com/c/chromium/src/+/5691321
- 5709097: ui: remove SelectFileDialog impl params | https://chromium-review.googlesource.com/c/chromium/src/+/5709097
- https://issues.chromium.org/issues/340178601 "reconsider SelectFileDialog"
This restructures the patch to work with mostly the same mechanics, but directly on the `ui::SelectFileDialog` object. This nets us some wins in terms of a smaller patch.
* 5713262: DevTools UI binding AIDA client event returns response
https://chromium-review.googlesource.com/c/chromium/src/+/5713262
* fixup! refactor: linux open/save dialog patch
* chore: bump chromium in DEPS to 128.0.6606.0
* chore: update patches
* fixup! refactor: linux open/save dialog patch
* chore: bump chromium in DEPS to 128.0.6607.0
* chore: update printing.patch
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5722937
* fix: pwd error in electron-test, nan-test
fix: unshallow depot_tools before 3-way apply
* chore: e patches all
* fixup! fix: pwd error in electron-test, nan-test
* chore: bump chromium in DEPS to 128.0.6609.0
* chore: bump chromium in DEPS to 128.0.6611.0
* chore: update patches
* chore: update libcxx filenames
---------
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
Co-authored-by: Jeremy Rose <nornagon@nornagon.net>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: clavin <clavin@electronjs.org>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
Co-authored-by: Alice Zhao <alice@makenotion.com>
* chore: delete duplicate declaration from merge conflict
* chore: bump chromium in DEPS to 128.0.6613.7
* Revert "chore: bump chromium in DEPS to 128.0.6613.7"
This reverts commit 78047428269c79d4d3532619daf0f07e307f4dbc.
---------
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
Co-authored-by: Jeremy Rose <nornagon@nornagon.net>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: clavin <clavin@electronjs.org>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
2024-07-25 09:24:11 +00:00
|
|
|
const std::vector<ui::SelectedFileInfo>& files) {
|
2022-02-10 02:58:52 +00:00
|
|
|
#if BUILDFLAG(IS_MAC)
|
2021-09-14 10:16:34 +00:00
|
|
|
base::ThreadPool::PostTask(
|
|
|
|
FROM_HERE,
|
|
|
|
{base::MayBlock(), base::TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN},
|
|
|
|
base::BindOnce(&FileSelectHelper::ProcessSelectedFilesMac, this, files));
|
|
|
|
#else
|
|
|
|
ConvertToFileChooserFileInfoList(files);
|
2022-02-10 02:58:52 +00:00
|
|
|
#endif // BUILDFLAG(IS_MAC)
|
2021-09-14 10:16:34 +00:00
|
|
|
}
|
2020-10-28 00:05:28 +00:00
|
|
|
|
chore: bump chromium to 128.0.6611.0 (32-x-y) (#43017)
* chore: bump chromium to 128.0.6611.0 (main) (#42779)
* chore: bump chromium in DEPS to 128.0.6577.0
* chore: bump chromium in DEPS to 128.0.6579.0
* 5675706: Reland "Reland "Reland "Reland "Add toolchains without PartitionAlloc-Everywhere for dump_syms et al""""
https://chromium-review.googlesource.com/c/chromium/src/+/5675706
* 5668597: [PDF Ink Signatures] Prompt download menu on save when there are edits
https://chromium-review.googlesource.com/c/chromium/src/+/5668597
* 5677014: Reland "Pull data_sharing_sdk from CIPD"
https://chromium-review.googlesource.com/c/chromium/src/+/5677014
* chore: fixup patch indices
* chore: bump chromium in DEPS to 128.0.6581.0
* chore: bump chromium in DEPS to 128.0.6583.0
* update patches
* 5455480: [Extensions] Allow service worker requests to continue without a cert
https://chromium-review.googlesource.com/c/chromium/src/+/5455480
* try to get some debugging output from script/push-patch.js
* chore: bump chromium in DEPS to 128.0.6585.0
* chore: bump chromium in DEPS to 128.0.6587.0
* update patches
* chore: bump chromium in DEPS to 128.0.6589.0
* more patch work
* maybe over here?
* chore: update patches
* 5673207: [HTTPS Upgrades] Disable in captive portal login webview
https://chromium-review.googlesource.com/c/chromium/src/+/5673207
* 5636785: Extensions: WAR: manifest.json's use_dynamic_url requires a dynamic url
https://chromium-review.googlesource.com/c/chromium/src/+/5636785
* chore: bump chromium in DEPS to 128.0.6591.0
* 5665458: Trigger WN2 page when feature is enabled
https://chromium-review.googlesource.com/c/chromium/src/+/5665458
* update patches
* chore: bump chromium in DEPS to 128.0.6593.0
* chore: bump chromium in DEPS to 128.0.6595.0
* chore: bump chromium in DEPS to 128.0.6597.0
* (patch update) 5694586: [compile hints] Remove the usage of v8::Isolate::SetJavaScriptCompileHintsMagicEnabledCallback API
https://chromium-review.googlesource.com/c/chromium/src/+/5694586
* update patches
* 5691287: Reland "Change blink::WebKeyboardEvent to use std::array in is members"
https://chromium-review.googlesource.com/c/chromium/src/+/5691287
The code changed here is modeled after code in `content/renderer/pepper/event_conversion.cc` that was also modified in this CL, so I took the same approach.
* 5529018: Cleanup EnableWebHidOnExtensionServiceWorker flag
https://chromium-review.googlesource.com/c/chromium/src/+/5529018
* 5526324: [Code Health] Add deprecation comment for base::SupportsWeakPtr.
https://chromium-review.googlesource.com/c/chromium/src/+/5526324
Note that this CL actually does make `SupportsWeakPtr` strictly restricted to existing implementations, no new ones. We could add a patch to add ourselves to this list, but it looks like we'll have to refactor this anyways in the near future. Since the refactor seems straightforward, let's try that first.
* chore: bump chromium in DEPS to 128.0.6598.0
* chore: update patches
* 5704737: Rename ExclusiveAccessContext::GetActiveWebContents to avoid conflict
https://chromium-review.googlesource.com/c/chromium/src/+/5704737
* chore: bump chromium in DEPS to 128.0.6601.0
* chore: update patches
* Add `base::StringPiece` header includes
Chromium is working on replacing `base::StringPiece` with `std::string_view`. (See the Chromium Bug below.) They're currently running mass codemods (across many multiple changes) to replace uses of `StringPiece` with `string_view`, including removing the header include for `StringPiece` in those files. This cascades down to our files that were implicitly depending on those includes through some other include.
They're on track to eventually deprecate and remove `StringPiece` so our code should be converted, but that can be done as an upgrade follow-up task. For now, adding the header back to files that need it should suffice for minimal upgrade changes.
Chromium Bug: https://issues.chromium.org/issues/40506050
* 5702737: GlobalRequestID: Avoid unwanted inlining and narrowing int conversions
https://chromium-review.googlesource.com/c/chromium/src/+/5702737
contender for smallest commit 2024
* 5706534: Rename GlobalFeatures to GlobalDesktopFeatures.
https://chromium-review.googlesource.com/c/chromium/src/+/5706534
* 5691321: ui: remove params variants of SelectFile listener functions
https://chromium-review.googlesource.com/c/chromium/src/+/5691321
* 5714949: [Extensions] Display re-enable dialog for MV2 disabled stage
https://chromium-review.googlesource.com/c/chromium/src/+/5714949
* chore: update libc++ filenames
* patch: disable scope reuse & associated dchecks in v8 (hopefully temp, upgrade follow-up)
* fixup! Add `base::StringPiece` header includes
* update MAS patch
5710330: Add crash keys to debug NativeWidgetMacNSWindowBorderlessFrame exception
https://chromium-review.googlesource.com/c/chromium/src/+/5710330
* chore: bump chromium in DEPS to 128.0.6603.0
* chore: update patches
* 5713258: Reland "Preparation for decoupling creation/initialization of context"
https://chromium-review.googlesource.com/c/chromium/src/+/5713258
When destroying a context, it must already be shutdown, and this change enforces it with a new CHECK.
We were overriding `BrowserContextKeyedServiceFactory::BrowserContextShutdown` with an empty implementation, which differed from the default implementation that notifies the `KeyedServiceFactory` that the context has shutdown. Since we were missing this notification, the CHECK would later trip when the service was being destoryed because it was not registered as shutdown when it was shutdown.
* chore: bump chromium in DEPS to 128.0.6605.2
* chore: update patches
* refactor: linux open/save dialog patch
Our existing implementation was relying on an opaque `void* params` parameter that was passed through `ui::SelectFileDialog`.
Recently, that parameter has been getting removed:
- 5691321: ui: remove params variants of SelectFile listener functions | https://chromium-review.googlesource.com/c/chromium/src/+/5691321
- 5709097: ui: remove SelectFileDialog impl params | https://chromium-review.googlesource.com/c/chromium/src/+/5709097
- https://issues.chromium.org/issues/340178601 "reconsider SelectFileDialog"
This restructures the patch to work with mostly the same mechanics, but directly on the `ui::SelectFileDialog` object. This nets us some wins in terms of a smaller patch.
* 5713262: DevTools UI binding AIDA client event returns response
https://chromium-review.googlesource.com/c/chromium/src/+/5713262
* fixup! refactor: linux open/save dialog patch
* chore: bump chromium in DEPS to 128.0.6606.0
* chore: update patches
* fixup! refactor: linux open/save dialog patch
* chore: bump chromium in DEPS to 128.0.6607.0
* chore: update printing.patch
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5722937
* fix: pwd error in electron-test, nan-test
fix: unshallow depot_tools before 3-way apply
* chore: e patches all
* fixup! fix: pwd error in electron-test, nan-test
* chore: bump chromium in DEPS to 128.0.6609.0
* chore: bump chromium in DEPS to 128.0.6611.0
* chore: update patches
* chore: update libcxx filenames
---------
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
Co-authored-by: Jeremy Rose <nornagon@nornagon.net>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: clavin <clavin@electronjs.org>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
Co-authored-by: Alice Zhao <alice@makenotion.com>
* chore: delete duplicate declaration from merge conflict
* chore: bump chromium in DEPS to 128.0.6613.7
* Revert "chore: bump chromium in DEPS to 128.0.6613.7"
This reverts commit 78047428269c79d4d3532619daf0f07e307f4dbc.
---------
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
Co-authored-by: Jeremy Rose <nornagon@nornagon.net>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: clavin <clavin@electronjs.org>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
2024-07-25 09:24:11 +00:00
|
|
|
void FileSelectHelper::FileSelectionCanceled() {
|
2021-09-14 10:16:34 +00:00
|
|
|
RunFileChooserEnd();
|
|
|
|
}
|
2020-10-28 00:05:28 +00:00
|
|
|
|
2021-09-14 10:16:34 +00:00
|
|
|
void FileSelectHelper::StartNewEnumeration(const base::FilePath& path) {
|
|
|
|
base_dir_ = path;
|
|
|
|
auto entry = std::make_unique<ActiveDirectoryEnumeration>(path);
|
|
|
|
entry->lister_ = base::WrapUnique(new net::DirectoryLister(
|
|
|
|
path, net::DirectoryLister::NO_SORT_RECURSIVE, this));
|
|
|
|
entry->lister_->Start();
|
|
|
|
directory_enumeration_ = std::move(entry);
|
2020-10-28 00:05:28 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void FileSelectHelper::OnListFile(
|
|
|
|
const net::DirectoryLister::DirectoryListerData& data) {
|
2021-09-14 10:16:34 +00:00
|
|
|
// Directory upload only cares about files.
|
|
|
|
if (data.info.IsDirectory())
|
|
|
|
return;
|
|
|
|
|
|
|
|
directory_enumeration_->results_.push_back(data.path);
|
|
|
|
}
|
|
|
|
|
|
|
|
void FileSelectHelper::LaunchConfirmationDialog(
|
|
|
|
const base::FilePath& path,
|
|
|
|
std::vector<ui::SelectedFileInfo> selected_files) {
|
2022-02-25 18:17:35 +00:00
|
|
|
ConvertToFileChooserFileInfoList(std::move(selected_files));
|
2021-09-14 10:16:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void FileSelectHelper::OnListDone(int error) {
|
|
|
|
if (!web_contents_) {
|
|
|
|
// Web contents was destroyed under us (probably by closing the tab). We
|
2020-10-28 00:05:28 +00:00
|
|
|
// must notify |listener_| and release our reference to
|
|
|
|
// ourself. RunFileChooserEnd() performs this.
|
|
|
|
RunFileChooserEnd();
|
|
|
|
return;
|
|
|
|
}
|
2021-09-14 10:16:34 +00:00
|
|
|
|
|
|
|
// This entry needs to be cleaned up when this function is done.
|
|
|
|
std::unique_ptr<ActiveDirectoryEnumeration> entry =
|
|
|
|
std::move(directory_enumeration_);
|
|
|
|
if (error) {
|
chore: bump chromium to 128.0.6611.0 (32-x-y) (#43017)
* chore: bump chromium to 128.0.6611.0 (main) (#42779)
* chore: bump chromium in DEPS to 128.0.6577.0
* chore: bump chromium in DEPS to 128.0.6579.0
* 5675706: Reland "Reland "Reland "Reland "Add toolchains without PartitionAlloc-Everywhere for dump_syms et al""""
https://chromium-review.googlesource.com/c/chromium/src/+/5675706
* 5668597: [PDF Ink Signatures] Prompt download menu on save when there are edits
https://chromium-review.googlesource.com/c/chromium/src/+/5668597
* 5677014: Reland "Pull data_sharing_sdk from CIPD"
https://chromium-review.googlesource.com/c/chromium/src/+/5677014
* chore: fixup patch indices
* chore: bump chromium in DEPS to 128.0.6581.0
* chore: bump chromium in DEPS to 128.0.6583.0
* update patches
* 5455480: [Extensions] Allow service worker requests to continue without a cert
https://chromium-review.googlesource.com/c/chromium/src/+/5455480
* try to get some debugging output from script/push-patch.js
* chore: bump chromium in DEPS to 128.0.6585.0
* chore: bump chromium in DEPS to 128.0.6587.0
* update patches
* chore: bump chromium in DEPS to 128.0.6589.0
* more patch work
* maybe over here?
* chore: update patches
* 5673207: [HTTPS Upgrades] Disable in captive portal login webview
https://chromium-review.googlesource.com/c/chromium/src/+/5673207
* 5636785: Extensions: WAR: manifest.json's use_dynamic_url requires a dynamic url
https://chromium-review.googlesource.com/c/chromium/src/+/5636785
* chore: bump chromium in DEPS to 128.0.6591.0
* 5665458: Trigger WN2 page when feature is enabled
https://chromium-review.googlesource.com/c/chromium/src/+/5665458
* update patches
* chore: bump chromium in DEPS to 128.0.6593.0
* chore: bump chromium in DEPS to 128.0.6595.0
* chore: bump chromium in DEPS to 128.0.6597.0
* (patch update) 5694586: [compile hints] Remove the usage of v8::Isolate::SetJavaScriptCompileHintsMagicEnabledCallback API
https://chromium-review.googlesource.com/c/chromium/src/+/5694586
* update patches
* 5691287: Reland "Change blink::WebKeyboardEvent to use std::array in is members"
https://chromium-review.googlesource.com/c/chromium/src/+/5691287
The code changed here is modeled after code in `content/renderer/pepper/event_conversion.cc` that was also modified in this CL, so I took the same approach.
* 5529018: Cleanup EnableWebHidOnExtensionServiceWorker flag
https://chromium-review.googlesource.com/c/chromium/src/+/5529018
* 5526324: [Code Health] Add deprecation comment for base::SupportsWeakPtr.
https://chromium-review.googlesource.com/c/chromium/src/+/5526324
Note that this CL actually does make `SupportsWeakPtr` strictly restricted to existing implementations, no new ones. We could add a patch to add ourselves to this list, but it looks like we'll have to refactor this anyways in the near future. Since the refactor seems straightforward, let's try that first.
* chore: bump chromium in DEPS to 128.0.6598.0
* chore: update patches
* 5704737: Rename ExclusiveAccessContext::GetActiveWebContents to avoid conflict
https://chromium-review.googlesource.com/c/chromium/src/+/5704737
* chore: bump chromium in DEPS to 128.0.6601.0
* chore: update patches
* Add `base::StringPiece` header includes
Chromium is working on replacing `base::StringPiece` with `std::string_view`. (See the Chromium Bug below.) They're currently running mass codemods (across many multiple changes) to replace uses of `StringPiece` with `string_view`, including removing the header include for `StringPiece` in those files. This cascades down to our files that were implicitly depending on those includes through some other include.
They're on track to eventually deprecate and remove `StringPiece` so our code should be converted, but that can be done as an upgrade follow-up task. For now, adding the header back to files that need it should suffice for minimal upgrade changes.
Chromium Bug: https://issues.chromium.org/issues/40506050
* 5702737: GlobalRequestID: Avoid unwanted inlining and narrowing int conversions
https://chromium-review.googlesource.com/c/chromium/src/+/5702737
contender for smallest commit 2024
* 5706534: Rename GlobalFeatures to GlobalDesktopFeatures.
https://chromium-review.googlesource.com/c/chromium/src/+/5706534
* 5691321: ui: remove params variants of SelectFile listener functions
https://chromium-review.googlesource.com/c/chromium/src/+/5691321
* 5714949: [Extensions] Display re-enable dialog for MV2 disabled stage
https://chromium-review.googlesource.com/c/chromium/src/+/5714949
* chore: update libc++ filenames
* patch: disable scope reuse & associated dchecks in v8 (hopefully temp, upgrade follow-up)
* fixup! Add `base::StringPiece` header includes
* update MAS patch
5710330: Add crash keys to debug NativeWidgetMacNSWindowBorderlessFrame exception
https://chromium-review.googlesource.com/c/chromium/src/+/5710330
* chore: bump chromium in DEPS to 128.0.6603.0
* chore: update patches
* 5713258: Reland "Preparation for decoupling creation/initialization of context"
https://chromium-review.googlesource.com/c/chromium/src/+/5713258
When destroying a context, it must already be shutdown, and this change enforces it with a new CHECK.
We were overriding `BrowserContextKeyedServiceFactory::BrowserContextShutdown` with an empty implementation, which differed from the default implementation that notifies the `KeyedServiceFactory` that the context has shutdown. Since we were missing this notification, the CHECK would later trip when the service was being destoryed because it was not registered as shutdown when it was shutdown.
* chore: bump chromium in DEPS to 128.0.6605.2
* chore: update patches
* refactor: linux open/save dialog patch
Our existing implementation was relying on an opaque `void* params` parameter that was passed through `ui::SelectFileDialog`.
Recently, that parameter has been getting removed:
- 5691321: ui: remove params variants of SelectFile listener functions | https://chromium-review.googlesource.com/c/chromium/src/+/5691321
- 5709097: ui: remove SelectFileDialog impl params | https://chromium-review.googlesource.com/c/chromium/src/+/5709097
- https://issues.chromium.org/issues/340178601 "reconsider SelectFileDialog"
This restructures the patch to work with mostly the same mechanics, but directly on the `ui::SelectFileDialog` object. This nets us some wins in terms of a smaller patch.
* 5713262: DevTools UI binding AIDA client event returns response
https://chromium-review.googlesource.com/c/chromium/src/+/5713262
* fixup! refactor: linux open/save dialog patch
* chore: bump chromium in DEPS to 128.0.6606.0
* chore: update patches
* fixup! refactor: linux open/save dialog patch
* chore: bump chromium in DEPS to 128.0.6607.0
* chore: update printing.patch
Xref: https://chromium-review.googlesource.com/c/chromium/src/+/5722937
* fix: pwd error in electron-test, nan-test
fix: unshallow depot_tools before 3-way apply
* chore: e patches all
* fixup! fix: pwd error in electron-test, nan-test
* chore: bump chromium in DEPS to 128.0.6609.0
* chore: bump chromium in DEPS to 128.0.6611.0
* chore: update patches
* chore: update libcxx filenames
---------
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
Co-authored-by: Jeremy Rose <nornagon@nornagon.net>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: clavin <clavin@electronjs.org>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
Co-authored-by: Alice Zhao <alice@makenotion.com>
* chore: delete duplicate declaration from merge conflict
* chore: bump chromium in DEPS to 128.0.6613.7
* Revert "chore: bump chromium in DEPS to 128.0.6613.7"
This reverts commit 78047428269c79d4d3532619daf0f07e307f4dbc.
---------
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
Co-authored-by: Jeremy Rose <nornagon@nornagon.net>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: clavin <clavin@electronjs.org>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
2024-07-25 09:24:11 +00:00
|
|
|
FileSelectionCanceled();
|
2020-10-28 00:05:28 +00:00
|
|
|
return;
|
2021-09-14 10:16:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
std::vector<ui::SelectedFileInfo> selected_files =
|
|
|
|
ui::FilePathListToSelectedFileInfoList(entry->results_);
|
|
|
|
|
|
|
|
if (dialog_type_ == ui::SelectFileDialog::SELECT_UPLOAD_FOLDER) {
|
|
|
|
LaunchConfirmationDialog(entry->path_, std::move(selected_files));
|
|
|
|
} else {
|
|
|
|
std::vector<FileChooserFileInfoPtr> chooser_files;
|
|
|
|
for (const auto& file_path : entry->results_) {
|
|
|
|
chooser_files.push_back(FileChooserFileInfo::NewNativeFile(
|
|
|
|
blink::mojom::NativeFileInfo::New(file_path, std::u16string())));
|
|
|
|
}
|
2020-10-28 00:05:28 +00:00
|
|
|
|
2021-09-14 10:16:34 +00:00
|
|
|
listener_->FileSelected(std::move(chooser_files), base_dir_,
|
|
|
|
FileChooserParams::Mode::kUploadFolder);
|
|
|
|
listener_.reset();
|
|
|
|
EnumerateDirectoryEnd();
|
|
|
|
}
|
2020-10-28 00:05:28 +00:00
|
|
|
}
|
|
|
|
|
2021-09-14 10:16:34 +00:00
|
|
|
void FileSelectHelper::ConvertToFileChooserFileInfoList(
|
|
|
|
const std::vector<ui::SelectedFileInfo>& files) {
|
|
|
|
if (AbortIfWebContentsDestroyed())
|
2020-10-28 00:05:28 +00:00
|
|
|
return;
|
|
|
|
|
2021-09-14 10:16:34 +00:00
|
|
|
std::vector<FileChooserFileInfoPtr> chooser_files;
|
|
|
|
for (const auto& file : files) {
|
|
|
|
chooser_files.push_back(
|
|
|
|
FileChooserFileInfo::NewNativeFile(blink::mojom::NativeFileInfo::New(
|
|
|
|
file.local_path,
|
|
|
|
base::FilePath(file.display_name).AsUTF16Unsafe())));
|
|
|
|
}
|
2020-10-28 00:05:28 +00:00
|
|
|
|
2021-09-14 10:16:34 +00:00
|
|
|
PerformContentAnalysisIfNeeded(std::move(chooser_files));
|
2020-10-28 00:05:28 +00:00
|
|
|
}
|
|
|
|
|
2021-09-14 10:16:34 +00:00
|
|
|
void FileSelectHelper::PerformContentAnalysisIfNeeded(
|
|
|
|
std::vector<FileChooserFileInfoPtr> list) {
|
|
|
|
if (AbortIfWebContentsDestroyed())
|
2020-10-28 00:05:28 +00:00
|
|
|
return;
|
|
|
|
|
2021-09-14 10:16:34 +00:00
|
|
|
NotifyListenerAndEnd(std::move(list));
|
|
|
|
}
|
|
|
|
|
|
|
|
void FileSelectHelper::NotifyListenerAndEnd(
|
|
|
|
std::vector<blink::mojom::FileChooserFileInfoPtr> list) {
|
|
|
|
listener_->FileSelected(std::move(list), base_dir_, dialog_mode_);
|
|
|
|
listener_.reset();
|
2020-10-28 00:05:28 +00:00
|
|
|
|
2021-09-14 10:16:34 +00:00
|
|
|
// No members should be accessed from here on.
|
|
|
|
RunFileChooserEnd();
|
2020-10-28 00:05:28 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void FileSelectHelper::DeleteTemporaryFiles() {
|
|
|
|
base::ThreadPool::PostTask(
|
|
|
|
FROM_HERE,
|
|
|
|
{base::MayBlock(), base::TaskPriority::BEST_EFFORT,
|
|
|
|
base::TaskShutdownBehavior::BLOCK_SHUTDOWN},
|
|
|
|
base::BindOnce(&DeleteFiles, std::move(temporary_files_)));
|
|
|
|
}
|
|
|
|
|
2021-09-14 10:16:34 +00:00
|
|
|
void FileSelectHelper::CleanUp() {
|
|
|
|
if (!temporary_files_.empty()) {
|
|
|
|
DeleteTemporaryFiles();
|
|
|
|
|
|
|
|
// Now that the temporary files have been scheduled for deletion, there
|
|
|
|
// is no longer any reason to keep this instance around.
|
|
|
|
Release();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
bool FileSelectHelper::AbortIfWebContentsDestroyed() {
|
|
|
|
if (render_frame_host_ == nullptr || web_contents_ == nullptr) {
|
|
|
|
RunFileChooserEnd();
|
|
|
|
return true;
|
|
|
|
}
|
2020-10-28 00:05:28 +00:00
|
|
|
|
2021-09-14 10:16:34 +00:00
|
|
|
return false;
|
2020-10-28 00:05:28 +00:00
|
|
|
}
|
|
|
|
|
2021-09-14 10:16:34 +00:00
|
|
|
void FileSelectHelper::SetFileSelectListenerForTesting(
|
|
|
|
scoped_refptr<content::FileSelectListener> listener) {
|
|
|
|
DCHECK(listener);
|
|
|
|
DCHECK(!listener_);
|
|
|
|
listener_ = std::move(listener);
|
|
|
|
}
|
2020-10-28 00:05:28 +00:00
|
|
|
|
2021-09-14 10:16:34 +00:00
|
|
|
std::unique_ptr<ui::SelectFileDialog::FileTypeInfo>
|
|
|
|
FileSelectHelper::GetFileTypesFromAcceptType(
|
|
|
|
const std::vector<std::u16string>& accept_types) {
|
|
|
|
std::unique_ptr<ui::SelectFileDialog::FileTypeInfo> base_file_type(
|
|
|
|
new ui::SelectFileDialog::FileTypeInfo());
|
|
|
|
if (accept_types.empty())
|
|
|
|
return base_file_type;
|
|
|
|
|
|
|
|
// Create FileTypeInfo and pre-allocate for the first extension list.
|
|
|
|
std::unique_ptr<ui::SelectFileDialog::FileTypeInfo> file_type(
|
|
|
|
new ui::SelectFileDialog::FileTypeInfo(*base_file_type));
|
|
|
|
file_type->include_all_files = true;
|
|
|
|
file_type->extensions.resize(1);
|
|
|
|
std::vector<base::FilePath::StringType>* extensions =
|
|
|
|
&file_type->extensions.back();
|
|
|
|
|
|
|
|
// Find the corresponding extensions.
|
|
|
|
int valid_type_count = 0;
|
|
|
|
int description_id = 0;
|
|
|
|
for (const auto& accept_type : accept_types) {
|
|
|
|
size_t old_extension_size = extensions->size();
|
|
|
|
if (accept_type[0] == '.') {
|
|
|
|
// If the type starts with a period it is assumed to be a file extension
|
|
|
|
// so we just have to add it to the list.
|
|
|
|
base::FilePath::StringType ext =
|
|
|
|
base::FilePath::FromUTF16Unsafe(accept_type).value();
|
|
|
|
extensions->push_back(ext.substr(1));
|
|
|
|
} else {
|
|
|
|
if (!base::IsStringASCII(accept_type))
|
|
|
|
continue;
|
|
|
|
std::string ascii_type = base::UTF16ToASCII(accept_type);
|
|
|
|
if (ascii_type == "image/*")
|
|
|
|
description_id = IDS_IMAGE_FILES;
|
|
|
|
else if (ascii_type == "audio/*")
|
|
|
|
description_id = IDS_AUDIO_FILES;
|
|
|
|
else if (ascii_type == "video/*")
|
|
|
|
description_id = IDS_VIDEO_FILES;
|
|
|
|
|
|
|
|
net::GetExtensionsForMimeType(ascii_type, extensions);
|
2020-10-28 00:05:28 +00:00
|
|
|
}
|
2021-09-14 10:16:34 +00:00
|
|
|
|
|
|
|
if (extensions->size() > old_extension_size)
|
|
|
|
valid_type_count++;
|
2020-10-28 00:05:28 +00:00
|
|
|
}
|
2021-09-14 10:16:34 +00:00
|
|
|
|
|
|
|
// If no valid extension is added, bail out.
|
|
|
|
if (valid_type_count == 0)
|
|
|
|
return base_file_type;
|
|
|
|
|
|
|
|
// Use a generic description "Custom Files" if either of the following is
|
|
|
|
// true:
|
|
|
|
// 1) There're multiple types specified, like "audio/*,video/*"
|
|
|
|
// 2) There're multiple extensions for a MIME type without parameter, like
|
|
|
|
// "ehtml,shtml,htm,html" for "text/html". On Windows, the select file
|
|
|
|
// dialog uses the first extension in the list to form the description,
|
|
|
|
// like "EHTML Files". This is not what we want.
|
|
|
|
if (valid_type_count > 1 ||
|
|
|
|
(valid_type_count == 1 && description_id == 0 && extensions->size() > 1))
|
|
|
|
description_id = IDS_CUSTOM_FILES;
|
|
|
|
|
|
|
|
if (description_id) {
|
|
|
|
file_type->extension_description_overrides.push_back(
|
|
|
|
l10n_util::GetStringUTF16(description_id));
|
|
|
|
}
|
|
|
|
|
|
|
|
return file_type;
|
2020-10-28 00:05:28 +00:00
|
|
|
}
|
|
|
|
|
2021-09-14 10:16:34 +00:00
|
|
|
// static
|
|
|
|
void FileSelectHelper::RunFileChooser(
|
|
|
|
content::RenderFrameHost* render_frame_host,
|
|
|
|
scoped_refptr<content::FileSelectListener> listener,
|
|
|
|
const FileChooserParams& params) {
|
|
|
|
// FileSelectHelper will keep itself alive until it sends the result
|
|
|
|
// message.
|
|
|
|
scoped_refptr<FileSelectHelper> file_select_helper(new FileSelectHelper());
|
|
|
|
file_select_helper->RunFileChooser(render_frame_host, std::move(listener),
|
|
|
|
params.Clone());
|
|
|
|
}
|
2020-10-28 00:05:28 +00:00
|
|
|
|
2021-09-14 10:16:34 +00:00
|
|
|
// static
|
|
|
|
void FileSelectHelper::EnumerateDirectory(
|
|
|
|
content::WebContents* tab,
|
|
|
|
scoped_refptr<content::FileSelectListener> listener,
|
|
|
|
const base::FilePath& path) {
|
|
|
|
// FileSelectHelper will keep itself alive until it sends the result
|
|
|
|
// message.
|
|
|
|
scoped_refptr<FileSelectHelper> file_select_helper(new FileSelectHelper());
|
|
|
|
file_select_helper->EnumerateDirectoryImpl(tab, std::move(listener), path);
|
|
|
|
}
|
|
|
|
|
|
|
|
void FileSelectHelper::RunFileChooser(
|
|
|
|
content::RenderFrameHost* render_frame_host,
|
|
|
|
scoped_refptr<content::FileSelectListener> listener,
|
|
|
|
FileChooserParamsPtr params) {
|
|
|
|
DCHECK(!render_frame_host_);
|
|
|
|
DCHECK(!web_contents_);
|
|
|
|
DCHECK(listener);
|
|
|
|
DCHECK(!listener_);
|
|
|
|
DCHECK(params->default_file_name.empty() ||
|
|
|
|
params->mode == FileChooserParams::Mode::kSave)
|
|
|
|
<< "The default_file_name parameter should only be specified for Save "
|
|
|
|
"file choosers";
|
|
|
|
DCHECK(params->default_file_name == params->default_file_name.BaseName())
|
|
|
|
<< "The default_file_name parameter should not contain path separators";
|
|
|
|
|
|
|
|
render_frame_host_ = render_frame_host;
|
|
|
|
web_contents_ = WebContents::FromRenderFrameHost(render_frame_host);
|
|
|
|
listener_ = std::move(listener);
|
|
|
|
content::WebContentsObserver::Observe(web_contents_);
|
2020-10-28 00:05:28 +00:00
|
|
|
|
2021-09-14 10:16:34 +00:00
|
|
|
base::ThreadPool::PostTask(
|
|
|
|
FROM_HERE, {base::MayBlock()},
|
|
|
|
base::BindOnce(&FileSelectHelper::GetFileTypesInThreadPool, this,
|
|
|
|
std::move(params)));
|
|
|
|
|
|
|
|
// Because this class returns notifications to the RenderViewHost, it is
|
|
|
|
// difficult for callers to know how long to keep a reference to this
|
|
|
|
// instance. We AddRef() here to keep the instance alive after we return
|
|
|
|
// to the caller, until the last callback is received from the file dialog.
|
|
|
|
// At that point, we must call RunFileChooserEnd().
|
|
|
|
AddRef();
|
2020-10-28 00:05:28 +00:00
|
|
|
}
|
|
|
|
|
2021-09-14 10:16:34 +00:00
|
|
|
void FileSelectHelper::GetFileTypesInThreadPool(FileChooserParamsPtr params) {
|
|
|
|
select_file_types_ = GetFileTypesFromAcceptType(params->accept_types);
|
|
|
|
select_file_types_->allowed_paths =
|
|
|
|
params->need_local_path ? ui::SelectFileDialog::FileTypeInfo::NATIVE_PATH
|
|
|
|
: ui::SelectFileDialog::FileTypeInfo::ANY_PATH;
|
2020-10-28 00:05:28 +00:00
|
|
|
|
2021-09-14 10:16:34 +00:00
|
|
|
content::GetUIThreadTaskRunner({})->PostTask(
|
|
|
|
FROM_HERE,
|
|
|
|
base::BindOnce(&FileSelectHelper::GetSanitizedFilenameOnUIThread, this,
|
|
|
|
std::move(params)));
|
2020-10-28 00:05:28 +00:00
|
|
|
}
|
|
|
|
|
2021-09-14 10:16:34 +00:00
|
|
|
void FileSelectHelper::GetSanitizedFilenameOnUIThread(
|
|
|
|
FileChooserParamsPtr params) {
|
|
|
|
if (AbortIfWebContentsDestroyed())
|
|
|
|
return;
|
|
|
|
|
|
|
|
auto* browser_context = static_cast<electron::ElectronBrowserContext*>(
|
|
|
|
render_frame_host_->GetProcess()->GetBrowserContext());
|
|
|
|
base::FilePath default_file_path =
|
|
|
|
browser_context->prefs()
|
|
|
|
->GetFilePath(prefs::kSelectFileLastDirectory)
|
|
|
|
.Append(params->default_file_name);
|
|
|
|
|
|
|
|
RunFileChooserOnUIThread(default_file_path, std::move(params));
|
|
|
|
}
|
|
|
|
|
|
|
|
void FileSelectHelper::RunFileChooserOnUIThread(
|
|
|
|
const base::FilePath& default_file_path,
|
|
|
|
FileChooserParamsPtr params) {
|
|
|
|
DCHECK(params);
|
|
|
|
|
|
|
|
select_file_dialog_ = ui::SelectFileDialog::Create(this, nullptr);
|
|
|
|
if (!select_file_dialog_.get())
|
|
|
|
return;
|
|
|
|
|
|
|
|
dialog_mode_ = params->mode;
|
|
|
|
switch (params->mode) {
|
|
|
|
case FileChooserParams::Mode::kOpen:
|
|
|
|
dialog_type_ = ui::SelectFileDialog::SELECT_OPEN_FILE;
|
|
|
|
break;
|
|
|
|
case FileChooserParams::Mode::kOpenMultiple:
|
|
|
|
dialog_type_ = ui::SelectFileDialog::SELECT_OPEN_MULTI_FILE;
|
|
|
|
break;
|
|
|
|
case FileChooserParams::Mode::kUploadFolder:
|
|
|
|
dialog_type_ = ui::SelectFileDialog::SELECT_UPLOAD_FOLDER;
|
|
|
|
break;
|
|
|
|
case FileChooserParams::Mode::kSave:
|
|
|
|
dialog_type_ = ui::SelectFileDialog::SELECT_SAVEAS_FILE;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
// Prevent warning.
|
|
|
|
dialog_type_ = ui::SelectFileDialog::SELECT_OPEN_FILE;
|
|
|
|
NOTREACHED();
|
2020-10-28 00:05:28 +00:00
|
|
|
}
|
2021-09-14 10:16:34 +00:00
|
|
|
|
|
|
|
auto* web_contents = electron::api::WebContents::From(
|
|
|
|
content::WebContents::FromRenderFrameHost(render_frame_host_));
|
|
|
|
if (!web_contents || !web_contents->owner_window())
|
|
|
|
return;
|
|
|
|
|
|
|
|
// Never consider the current scope as hung. The hang watching deadline (if
|
|
|
|
// any) is not valid since the user can take unbounded time to choose the
|
|
|
|
// file.
|
|
|
|
base::HangWatcher::InvalidateActiveExpectations();
|
|
|
|
|
|
|
|
select_file_dialog_->SelectFile(
|
|
|
|
dialog_type_, params->title, default_file_path, select_file_types_.get(),
|
|
|
|
select_file_types_.get() && !select_file_types_->extensions.empty()
|
|
|
|
? 1
|
|
|
|
: 0, // 1-based index of default extension to show.
|
|
|
|
base::FilePath::StringType(),
|
2023-10-03 19:26:35 +00:00
|
|
|
web_contents->owner_window()->GetNativeWindow(), nullptr);
|
2021-09-14 10:16:34 +00:00
|
|
|
|
|
|
|
select_file_types_.reset();
|
|
|
|
}
|
|
|
|
|
|
|
|
// This method is called when we receive the last callback from the file chooser
|
|
|
|
// dialog or if the renderer was destroyed. Perform any cleanup and release the
|
|
|
|
// reference we added in RunFileChooser().
|
|
|
|
void FileSelectHelper::RunFileChooserEnd() {
|
|
|
|
// If there are temporary files, then this instance needs to stick around
|
|
|
|
// until web_contents_ is destroyed, so that this instance can delete the
|
|
|
|
// temporary files.
|
|
|
|
if (!temporary_files_.empty())
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (listener_)
|
|
|
|
listener_->FileSelectionCanceled();
|
|
|
|
render_frame_host_ = nullptr;
|
|
|
|
web_contents_ = nullptr;
|
2023-01-25 14:51:01 +00:00
|
|
|
// If the dialog was actually opened, dispose of our reference.
|
|
|
|
if (select_file_dialog_) {
|
|
|
|
select_file_dialog_->ListenerDestroyed();
|
|
|
|
select_file_dialog_.reset();
|
|
|
|
}
|
2021-09-14 10:16:34 +00:00
|
|
|
Release();
|
|
|
|
}
|
|
|
|
|
|
|
|
void FileSelectHelper::EnumerateDirectoryImpl(
|
|
|
|
content::WebContents* tab,
|
|
|
|
scoped_refptr<content::FileSelectListener> listener,
|
|
|
|
const base::FilePath& path) {
|
|
|
|
DCHECK(listener);
|
|
|
|
DCHECK(!listener_);
|
|
|
|
dialog_type_ = ui::SelectFileDialog::SELECT_NONE;
|
|
|
|
web_contents_ = tab;
|
|
|
|
listener_ = std::move(listener);
|
|
|
|
// Because this class returns notifications to the RenderViewHost, it is
|
|
|
|
// difficult for callers to know how long to keep a reference to this
|
|
|
|
// instance. We AddRef() here to keep the instance alive after we return
|
|
|
|
// to the caller, until the last callback is received from the enumeration
|
|
|
|
// code. At that point, we must call EnumerateDirectoryEnd().
|
|
|
|
AddRef();
|
|
|
|
StartNewEnumeration(path);
|
|
|
|
}
|
|
|
|
|
|
|
|
// This method is called when we receive the last callback from the enumeration
|
|
|
|
// code. Perform any cleanup and release the reference we added in
|
|
|
|
// EnumerateDirectoryImpl().
|
|
|
|
void FileSelectHelper::EnumerateDirectoryEnd() {
|
|
|
|
Release();
|
2020-10-28 00:05:28 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void FileSelectHelper::RenderFrameHostChanged(
|
|
|
|
content::RenderFrameHost* old_host,
|
|
|
|
content::RenderFrameHost* new_host) {
|
2021-09-14 10:16:34 +00:00
|
|
|
// The |old_host| and its children are now pending deletion. Do not give them
|
|
|
|
// file access past this point.
|
2021-10-06 02:21:00 +00:00
|
|
|
for (content::RenderFrameHost* host = render_frame_host_; host;
|
|
|
|
host = host->GetParentOrOuterDocument()) {
|
|
|
|
if (host == old_host) {
|
|
|
|
render_frame_host_ = nullptr;
|
|
|
|
return;
|
|
|
|
}
|
2020-10-28 00:05:28 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void FileSelectHelper::RenderFrameDeleted(
|
2021-09-14 10:16:34 +00:00
|
|
|
content::RenderFrameHost* render_frame_host) {
|
|
|
|
if (render_frame_host == render_frame_host_)
|
2020-10-28 00:05:28 +00:00
|
|
|
render_frame_host_ = nullptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
void FileSelectHelper::WebContentsDestroyed() {
|
|
|
|
render_frame_host_ = nullptr;
|
|
|
|
web_contents_ = nullptr;
|
2021-09-14 10:16:34 +00:00
|
|
|
CleanUp();
|
|
|
|
}
|
2020-10-28 00:05:28 +00:00
|
|
|
|
2021-09-14 10:16:34 +00:00
|
|
|
// static
|
|
|
|
bool FileSelectHelper::IsAcceptTypeValid(const std::string& accept_type) {
|
|
|
|
// TODO(raymes): This only does some basic checks, extend to test more cases.
|
|
|
|
// A 1 character accept type will always be invalid (either a "." in the case
|
|
|
|
// of an extension or a "/" in the case of a MIME type).
|
|
|
|
std::string unused;
|
|
|
|
if (accept_type.length() <= 1 ||
|
|
|
|
base::ToLowerASCII(accept_type) != accept_type ||
|
|
|
|
base::TrimWhitespaceASCII(accept_type, base::TRIM_ALL, &unused) !=
|
|
|
|
base::TRIM_NONE) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
return true;
|
|
|
|
}
|
2020-10-28 00:05:28 +00:00
|
|
|
|
2021-09-14 10:16:34 +00:00
|
|
|
// static
|
|
|
|
base::FilePath FileSelectHelper::GetSanitizedFileName(
|
|
|
|
const base::FilePath& suggested_filename) {
|
|
|
|
if (suggested_filename.empty())
|
|
|
|
return base::FilePath();
|
|
|
|
return net::GenerateFileName(
|
|
|
|
GURL(), std::string(), std::string(), suggested_filename.AsUTF8Unsafe(),
|
|
|
|
std::string(), l10n_util::GetStringUTF8(IDS_DEFAULT_DOWNLOAD_FILENAME));
|
2020-10-28 00:05:28 +00:00
|
|
|
}
|