electron/shell/browser/file_select_helper_mac.mm
electron-roller[bot] 89117fdd99
chore: bump chromium to 118.0.5975.0 (main) (#39531)
* chore: bump chromium in DEPS to 118.0.5951.0

* chore: update printing.patch

Xref: 4727894

No logic changes, but patch needed to be manually re-applied due to upstream code shear

* chore: update port_autofill_colors_to_the_color_pipeline.patch

No manual changes; patch applied with fuzz

* chore: update patches

* chore: bump chromium in DEPS to 118.0.5953.0

* chore: update patches

* chore: bump chromium in DEPS to 118.0.5955.0

* chore: update patches

* chore: bump chromium in DEPS to 118.0.5957.0

* chore: update patches

* chore: include path of native_web_keyboard_event.h

Xref: 4758689

* chore: remove reference to eextensions/browser/notification-types.h

Xref: 4771627

* chore: update references to renamed upstream field NativeWebKeyboardEvent.skip_if_unhandled (formerly known as skip_in_browser

Xref: 4758689

Need a second pair of eyes on this commit. In particular the reference in content_converter.cc, skipInBrowser, seems to not be set or documented anywhere? Is this unused/vestigal code?

* chore: sync signature of ElectronExtensionsBrowserClient::IsValidContext() to upstream change

Xref: 4784198

* chore: add auto_pip_setting_helper.[cc,h] to chromium_src build

Xref: 4688277

Exiting upstream code used by chromium_src now depends on this new upstream class

* chore: bump chromium in DEPS to 118.0.5959.0

* chore: update add_maximized_parameter_to_linuxui_getwindowframeprovider.patch

Xref: add_maximized_parameter_to_linuxui_getwindowframeprovider.patch

manually adjust patch to minor upstream chagnes

* chore: update patches

* chore: bump chromium in DEPS to 118.0.5961.0

* chore: bump chromium in DEPS to 118.0.5963.0

* chore: update patches

* 4780994: Rename various base files to "apple" since iOS uses them too
4780994

* Many files moved from `mac` -> `apple`

This commit follows a handful of CLs that simply rename files/symbols to change `mac`
to `apple`
to signify their use across both macOS and iOS:
- 4784010: Move scoped_nsautorelease_pool to base/apple, leave a forwarding header
- 4790744: Move foundation_util to base/apple, leave a forwarding header
- 4790741: Move scoped_cftypreref to base/apple, leave a forwarding header
- 4787627: Move and rename macOS+iOS base/ files in PA to "apple"
- 4780399: Move OSStatus logging to base/apple
- 4787387: Remove forwarding headers
- 4781113: Rename message_pump_mac to "apple" because iOS uses it too

* fixup minor patch update error

A function param got dropped from this patch somewhere earlier

* chore: bump chromium in DEPS to 118.0.5965.2

* chore: update patches

* 4799213: Move ScopedTypeRef and ScopedCFTypeRef into base:🍎:
4799213

* Fix removed include to BrowserContext

In crrev.com/c/4767962 an include to BrowserContext was removed,
which was necessary for compilation. This broke only for us because
"chrome/browser/profiles/profile.h" includes that class, but we remove
all references to profiles.

* chore: bump chromium in DEPS to 118.0.5967.0

* chore: update patches

* chore: bump chromium in DEPS to 118.0.5969.0

* chore: update patches

* chore: bump chromium in DEPS to 118.0.5971.0

* chore: bump chromium in DEPS to 118.0.5973.0

* chore: update patches

* 4772121: [OOPIF PDF] Replace PDFWebContentsHelper with PDFDocumentHelper
4772121

* 4811164: [Extensions] Do some cleanup in ChromeManagementAPIDelegate.
4811164

* 4809488: Remove duplicate dnd functionality between Web and Renderer prefs
4809488

Given that this is no longer an option of web preferences, we should
consider deprecating this option and then removing it.

* chore: bump chromium in DEPS to 118.0.5975.0

* chore: update patches

* fixup! chore: add auto_pip_settings_helper.{cc|h} to chromium_src build

* Reland "[windows] Remove RegKey::DeleteEmptyKey"

Refs 4813255

* Ensure StrCat means StrCat

Refs 1117180

* fixup! Remove RegKey::DeleteEmptyKey

* Consistently reject large p and large q in DH

Refs https://boringssl-review.googlesource.com/c/boringssl/+/62226

---------

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: clavin <clavin@electronjs.org>
Co-authored-by: deepak1556 <hop2deep@gmail.com>
2023-09-01 15:54:59 +09:00

146 lines
4.6 KiB
Text

// Copyright 2014 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "shell/browser/file_select_helper.h"
#include <Cocoa/Cocoa.h>
#include <sys/stat.h>
#include <vector>
#include "base/apple/foundation_util.h"
#include "base/files/file.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/functional/bind.h"
#include "content/public/browser/browser_task_traits.h"
#include "content/public/browser/browser_thread.h"
#include "third_party/zlib/google/zip.h"
#include "ui/shell_dialogs/selected_file_info.h"
namespace {
// Given the |path| of a package, returns the destination that the package
// should be zipped to. Returns an empty path on any errors.
base::FilePath ZipDestination(const base::FilePath& path) {
base::FilePath dest;
if (!base::GetTempDir(&dest)) {
// Couldn't get the temporary directory.
return base::FilePath();
}
// TMPDIR/<bundleID>/zip_cache/<guid>
NSString* bundleID = [[NSBundle mainBundle] bundleIdentifier];
dest = dest.Append([bundleID fileSystemRepresentation]);
dest = dest.Append("zip_cache");
NSString* guid = [[NSProcessInfo processInfo] globallyUniqueString];
dest = dest.Append([guid fileSystemRepresentation]);
return dest;
}
// Returns the path of the package and its components relative to the package's
// parent directory.
std::vector<base::FilePath> RelativePathsForPackage(
const base::FilePath& package) {
// Get the base directory.
base::FilePath base_dir = package.DirName();
// Add the package as the first relative path.
std::vector<base::FilePath> relative_paths;
relative_paths.push_back(package.BaseName());
// Add the components of the package as relative paths.
base::FileEnumerator file_enumerator(
package, true /* recursive */,
base::FileEnumerator::FILES | base::FileEnumerator::DIRECTORIES);
for (base::FilePath path = file_enumerator.Next(); !path.empty();
path = file_enumerator.Next()) {
base::FilePath relative_path;
bool success = base_dir.AppendRelativePath(path, &relative_path);
if (success)
relative_paths.push_back(relative_path);
}
return relative_paths;
}
} // namespace
base::FilePath FileSelectHelper::ZipPackage(const base::FilePath& path) {
base::FilePath dest(ZipDestination(path));
if (dest.empty())
return dest;
if (!base::CreateDirectory(dest.DirName()))
return base::FilePath();
base::File file(dest, base::File::FLAG_CREATE | base::File::FLAG_WRITE);
if (!file.IsValid())
return base::FilePath();
std::vector<base::FilePath> files_to_zip(RelativePathsForPackage(path));
base::FilePath base_dir = path.DirName();
bool success = zip::ZipFiles(base_dir, files_to_zip, file.GetPlatformFile());
int result = -1;
if (success)
result = fchmod(file.GetPlatformFile(), S_IRUSR);
return result >= 0 ? dest : base::FilePath();
}
void FileSelectHelper::ProcessSelectedFilesMac(
const std::vector<ui::SelectedFileInfo>& files) {
// Make a mutable copy of the input files.
std::vector<ui::SelectedFileInfo> files_out(files);
std::vector<base::FilePath> temporary_files;
for (auto& file_info : files_out) {
NSString* filename = base::apple::FilePathToNSString(file_info.local_path);
BOOL isPackage =
[[NSWorkspace sharedWorkspace] isFilePackageAtPath:filename];
if (isPackage && base::DirectoryExists(file_info.local_path)) {
base::FilePath result = ZipPackage(file_info.local_path);
if (!result.empty()) {
temporary_files.push_back(result);
file_info.local_path = result;
file_info.file_path = result;
file_info.display_name.append(".zip");
}
}
}
content::GetUIThreadTaskRunner({})->PostTask(
FROM_HERE,
base::BindOnce(&FileSelectHelper::ProcessSelectedFilesMacOnUIThread,
base::Unretained(this), files_out, temporary_files));
}
void FileSelectHelper::ProcessSelectedFilesMacOnUIThread(
const std::vector<ui::SelectedFileInfo>& files,
const std::vector<base::FilePath>& temporary_files) {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
if (!temporary_files.empty()) {
temporary_files_.insert(temporary_files_.end(), temporary_files.begin(),
temporary_files.end());
// Typically, |temporary_files| are deleted after |web_contents_| is
// destroyed. If |web_contents_| is already NULL, then the temporary files
// need to be deleted now.
if (!web_contents_) {
DeleteTemporaryFiles();
RunFileChooserEnd();
return;
}
}
ConvertToFileChooserFileInfoList(files);
}