d02c9f8bc6
* chore: bump chromium in DEPS to 111.0.5522.0 * chore: bump chromium in DEPS to 111.0.5524.0 * chore: bump chromium in DEPS to 111.0.5526.0 * chore: bump chromium in DEPS to 111.0.5528.0 * chore: update patches/chromium/mas_avoid_usage_of_private_macos_apis.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4132807 Fix simple code shear * chore: update patches/chromium/unsandboxed_ppapi_processes_skip_zygote.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4130675 Fix simple code shear * chore: update patches/chromium/hack_plugin_response_interceptor_to_point_to_electron.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4144281 Fix simple code shear; applied cleanly w/patch-fuzz * chore: update patches/chromium/disable_unload_metrics.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4126173 Fix simple code shear; applied cleanly w/patch-fuzz * chore: update patches/chromium/feat_add_data_parameter_to_processsingleton.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4144281 Fix simple code shear; applied cleanly w/patch-fuzz * chore: update patches/chromium/preconnect_manager.patch https://chromium-review.googlesource.com/c/chromium/src/+/4144281 Fix simple code shear; applied cleanly w/patch-fuzz * chore: update patches/v8/force_cppheapcreateparams_to_be_noncopyable.patch https://chromium-review.googlesource.com/c/v8/v8/+/3533019 Fix simple code shear; applied cleanly w/patch-fuzz * chore: update patches * chore: update patches/chromium/add_maximized_parameter_to_linuxui_getwindowframeprovider.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4128765 Upstream added a new call to HeaderContext(), whose signature we have patched * chore: bump chromium in DEPS to 111.0.5530.0 * chore: update patches * Move ChildProcessHost* from content/common to content/browser Xref: Move ChildProcessHost* from content/common to content/browser * Remove RenderViewHostChanged Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4134103 [upstream removal of RenderViewHostChanged] Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4092763 Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4093234 Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4133892 Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4134103 [examples of upstream code adjusting to the change] Upstream handles this change in roughly two approaches: 1. Move the code over to RenderFrameHostChanged(old_host, new_host) but test for new_host->IsInPrimaryMainFrame() before acting 2. Migrate to the PrimaryPageChanged(page) API and use page.GetMainDocument() to get the RenderFrameHost. I've chosen 1. because electron_api_web_contents needed that pointer to old_host to call RemoveInputEventListener(), but I may be missing some context & would appreciate review on this commit. * Make electron/shell/browser/relauncher_win.cc use <winternl.h> Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4129135 Many internal Windows types are now available in winternl.h so upstrem no longer defines the types themselves. * Move ChildProcessHost* from content/common to content/browser Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4134795 * fixup! Make electron/shell/browser/relauncher_win.cc use <winternl.h> winternl.h does not define the field we need, so clone the struct Chromium was using into unnamed namespace * fixup! Move ChildProcessHost* from content/common to content/browser chore: update #includes too * chore: bump chromium in DEPS to 111.0.5532.0 * chore: sync patches/chromium/pepper_plugin_support.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4133323 manually reync patch; no code changes * chore: sync patches/chromium/mas_no_private_api.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4143865 the content/common/pseudonymization_salt.cc patch is no longer needed * chore: sync patches/chromium/mas_disable_remote_accessibility.patch patch-fuzz update; no manual changes * chore: sync patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4111725 manually reync patch; no code changes * chore: sync patches/chromium/create_browser_v8_snapshot_file_name_fuse.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4133323 manually reync patch; no code changes * chore: sync patches/v8/fix_build_deprecated_attribute_for_older_msvc_versions.patch Xref: https://chromium-review.googlesource.com/c/v8/v8/+/4127230 patch-fuzz update; no manual changes * chore: rebuild patches * fixup! Remove RenderViewHostChanged Use PrimaryPageChanged() * chore: remove unused method TabsUpdateFunction::OnExecuteCodeFinished() Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4133991 This private, already-unused function showed up as a FTBFS because it took a base::ListValue parameter and ListValue was removed upstream. * task posting v3: remove includes of runner handles and IWYU task runners Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4133323 * chore: lint * chore: more lint * fixup! task posting v3: remove includes of runner handles and IWYU task runners macOS, too * fixup! task posting v3: remove includes of runner handles and IWYU task runners * chore: bump chromium in DEPS to 111.0.5534.0 * chore: sync patches/chromium/allow_new_privileges_in_unsandboxed_child_processes.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4141862 patch-fuzz update; no manual changes * chore: sync patches/chromium/logging_win32_only_create_a_console_if_logging_to_stderr.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4153110 Sync to minor upstream changes. Add const correctness. * chore: sync electron/patches/chromium/feat_configure_launch_options_for_service_process.patch https://chromium-review.googlesource.com/c/chromium/src/+/4141862 patch-fuzz update; no manual changes * chore: patches/v8/fix_build_deprecated_attribute_for_older_msvc_versions.patch sync https://chromium-review.googlesource.com/c/v8/v8/+/4147787 patch-fuzz update; no manual changes * chore: update patches * chore: bump chromium in DEPS to 111.0.5536.0 * chore: sync patches/chromium/allow_new_privileges_in_unsandboxed_child_processes.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4141863 Sync with upstream code changes. Minor code golf for readability. Note: upstream is laying groundwork for being able to work off of env vars instead of switches. Doesn't affect us yet but worth being aware of. > + // Environment variables could be supported in the future, but are not > + // currently supported when launching with the zygote. * chore: update patches/chromium/feat_expose_raw_response_headers_from_urlloader.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4126836 patch-fuzz update; no manual changes * chore: sync electron/patches/chromium/feat_configure_launch_options_for_service_process.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4141863 manual sync * chore: sync electron/patches/v8/fix_build_deprecated_attribute_for_older_msvc_versions.patch https://chromium-review.googlesource.com/c/v8/v8/+/4147788 fuzz-patch * chore: rebuild patches * chore: bump chromium in DEPS to 111.0.5538.0 * chore: bump chromium in DEPS to 111.0.5540.0 * chore: update patches * Remove sdk_forward_declarations https://chromium-review.googlesource.com/c/chromium/src/+/4166680 * task posting v3: Remove task runner handles from codebase entirely Refs https://chromium-review.googlesource.com/c/chromium/src/+/4150928 * Cleanup child_process_launcher_helper* Refs https://chromium-review.googlesource.com/c/chromium/src/+/4141863 * fix: utilityprocess spec on macOS * fix: build on windows Refs https://chromium-review.googlesource.com/c/chromium/src/+/4141863 * chore: fix lint * chore: bump chromium 111.0.5544.3 * chore: gen filenames.libcxx.gni * Add check for Executable+Writable handles in renderer processes. Refs https://chromium-review.googlesource.com/c/chromium/src/+/3774416 * fixup! Add check for Executable+Writable handles in renderer processes. * 4143761: [110] Disable SwiftShader for WebGL on M1 Macs. https://chromium-review.googlesource.com/c/chromium/src/+/4143761 (cherry picked from commit 2f74db3c2139424c416f92d9169aeaa8a2f9c1ec) * chore: bump chromium to 111.0.5555.0 * 56085: Remove hmac.h include from ssl.h. https://boringssl-review.googlesource.com/c/boringssl/+/56085 * 4167020: Remove forwarding headers https://chromium-review.googlesource.com/c/chromium/src/+/4167020 * chore: bump chromium to 111.0.5559.0 * 4181044: Restrict WebCursor usage to RenderWidgetHostViewAura https://chromium-review.googlesource.com/c/chromium/src/+/4181044 * 4189437: views: rename ink_drop_host_view to ink_drop_host https://chromium-review.googlesource.com/c/chromium/src/+/4189437 * chore: bump chromium to 111.0.5560.0 * 4167016: win7dep: remove non aeroglass code https://chromium-review.googlesource.com/c/chromium/src/+/4167016 * fixup after rebase: Remove forwarding header s https://chromium-review.googlesource.com/c/chromium/src/+/4167020 * 4125755: Reland "Reject getDisplayMedia calls without user activation" https://chromium-review.googlesource.com/c/chromium/src/+/4125755 * test: add workaround * chore: update patches * fix: alter coreModuleRegExp to prevent arm crash * Revert "fix: alter coreModuleRegExp to prevent arm crash" This reverts commit 7e50630c98137831a711c5abdbc8809e60cf1d73. * 4218354: Disable the use of preserve_most on arm64 Windows https://chromium-review.googlesource.com/c/v8/v8/+/4218354 * chore: review changes --------- 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: deepak1556 <hop2deep@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
206 lines
6.8 KiB
Text
206 lines
6.8 KiB
Text
// Copyright (c) 2013 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "shell/common/platform_util.h"
|
|
|
|
#include <string>
|
|
#include <utility>
|
|
|
|
#import <Carbon/Carbon.h>
|
|
#import <Cocoa/Cocoa.h>
|
|
#import <ServiceManagement/ServiceManagement.h>
|
|
|
|
#include "base/files/file_path.h"
|
|
#include "base/files/file_util.h"
|
|
#include "base/functional/callback.h"
|
|
#include "base/logging.h"
|
|
#include "base/mac/foundation_util.h"
|
|
#include "base/mac/mac_logging.h"
|
|
#include "base/mac/scoped_aedesc.h"
|
|
#include "base/strings/stringprintf.h"
|
|
#include "base/strings/sys_string_conversions.h"
|
|
#include "net/base/mac/url_conversions.h"
|
|
#include "ui/views/widget/widget.h"
|
|
#include "url/gurl.h"
|
|
|
|
namespace {
|
|
|
|
// This may be called from a global dispatch queue, the methods used here are
|
|
// thread safe, including LSGetApplicationForURL (> 10.2) and
|
|
// NSWorkspace#openURLs.
|
|
std::string OpenURL(NSURL* ns_url, bool activate) {
|
|
CFURLRef ref = LSCopyDefaultApplicationURLForURL(
|
|
base::mac::NSToCFCast(ns_url), kLSRolesAll, nullptr);
|
|
|
|
// If no application could be found, NULL is returned and outError
|
|
// (if not NULL) is populated with kLSApplicationNotFoundErr.
|
|
if (ref == NULL)
|
|
return "No application in the Launch Services database matches the input "
|
|
"criteria.";
|
|
|
|
NSUInteger launchOptions = NSWorkspaceLaunchDefault;
|
|
if (!activate)
|
|
launchOptions |= NSWorkspaceLaunchWithoutActivation;
|
|
|
|
bool opened = [[NSWorkspace sharedWorkspace] openURLs:@[ ns_url ]
|
|
withAppBundleIdentifier:nil
|
|
options:launchOptions
|
|
additionalEventParamDescriptor:nil
|
|
launchIdentifiers:nil];
|
|
if (!opened)
|
|
return "Failed to open URL";
|
|
|
|
return "";
|
|
}
|
|
|
|
NSString* GetLoginHelperBundleIdentifier() {
|
|
return [[[NSBundle mainBundle] bundleIdentifier]
|
|
stringByAppendingString:@".loginhelper"];
|
|
}
|
|
|
|
std::string OpenPathOnThread(const base::FilePath& full_path) {
|
|
NSString* path_string = base::SysUTF8ToNSString(full_path.value());
|
|
NSURL* url = [NSURL fileURLWithPath:path_string];
|
|
if (!url)
|
|
return "Invalid path";
|
|
|
|
const NSWorkspaceLaunchOptions launch_options =
|
|
NSWorkspaceLaunchAsync | NSWorkspaceLaunchWithErrorPresentation;
|
|
BOOL success = [[NSWorkspace sharedWorkspace] openURLs:@[ url ]
|
|
withAppBundleIdentifier:nil
|
|
options:launch_options
|
|
additionalEventParamDescriptor:nil
|
|
launchIdentifiers:NULL];
|
|
|
|
return success ? "" : "Failed to open path";
|
|
}
|
|
|
|
} // namespace
|
|
|
|
namespace platform_util {
|
|
|
|
void ShowItemInFolder(const base::FilePath& path) {
|
|
// The API only takes absolute path.
|
|
base::FilePath full_path =
|
|
path.IsAbsolute() ? path : base::MakeAbsoluteFilePath(path);
|
|
|
|
DCHECK([NSThread isMainThread]);
|
|
NSString* path_string = base::SysUTF8ToNSString(full_path.value());
|
|
if (!path_string || ![[NSWorkspace sharedWorkspace] selectFile:path_string
|
|
inFileViewerRootedAtPath:@""]) {
|
|
LOG(WARNING) << "NSWorkspace failed to select file " << full_path.value();
|
|
}
|
|
}
|
|
|
|
void OpenPath(const base::FilePath& full_path, OpenCallback callback) {
|
|
std::move(callback).Run(OpenPathOnThread(full_path));
|
|
}
|
|
|
|
void OpenExternal(const GURL& url,
|
|
const OpenExternalOptions& options,
|
|
OpenCallback callback) {
|
|
DCHECK([NSThread isMainThread]);
|
|
NSURL* ns_url = net::NSURLWithGURL(url);
|
|
if (!ns_url) {
|
|
std::move(callback).Run("Invalid URL");
|
|
return;
|
|
}
|
|
|
|
bool activate = options.activate;
|
|
__block OpenCallback c = std::move(callback);
|
|
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0),
|
|
^{
|
|
__block std::string error = OpenURL(ns_url, activate);
|
|
dispatch_async(dispatch_get_main_queue(), ^{
|
|
std::move(c).Run(error);
|
|
});
|
|
});
|
|
}
|
|
|
|
// The following function helps with debug builds on the Mac
|
|
gfx::NativeView GetViewForWindow(gfx::NativeWindow native_window) {
|
|
NOTREACHED();
|
|
return nil;
|
|
}
|
|
|
|
// The following function helps with debug builds on the Mac
|
|
gfx::NativeView GetParent(gfx::NativeView view) {
|
|
NOTREACHED();
|
|
return nil;
|
|
}
|
|
|
|
bool MoveItemToTrashWithError(const base::FilePath& full_path,
|
|
bool delete_on_fail,
|
|
std::string* error) {
|
|
NSString* path_string = base::SysUTF8ToNSString(full_path.value());
|
|
if (!path_string) {
|
|
*error = "Invalid file path: " + full_path.value();
|
|
LOG(WARNING) << *error;
|
|
return false;
|
|
}
|
|
|
|
NSURL* url = [NSURL fileURLWithPath:path_string];
|
|
NSError* err = nil;
|
|
BOOL did_trash = [[NSFileManager defaultManager] trashItemAtURL:url
|
|
resultingItemURL:nil
|
|
error:&err];
|
|
|
|
if (delete_on_fail) {
|
|
// Some volumes may not support a Trash folder or it may be disabled
|
|
// so these methods will report failure by returning NO or nil and
|
|
// an NSError with NSFeatureUnsupportedError.
|
|
// Handle this by deleting the item as a fallback.
|
|
if (!did_trash && [err code] == NSFeatureUnsupportedError) {
|
|
did_trash = [[NSFileManager defaultManager] removeItemAtURL:url
|
|
error:&err];
|
|
}
|
|
}
|
|
|
|
if (!did_trash) {
|
|
*error = base::SysNSStringToUTF8([err localizedDescription]);
|
|
LOG(WARNING) << "NSWorkspace failed to move file " << full_path.value()
|
|
<< " to trash: " << *error;
|
|
}
|
|
|
|
return did_trash;
|
|
}
|
|
|
|
namespace internal {
|
|
|
|
bool PlatformTrashItem(const base::FilePath& full_path, std::string* error) {
|
|
return MoveItemToTrashWithError(full_path, false, error);
|
|
}
|
|
|
|
} // namespace internal
|
|
|
|
void Beep() {
|
|
NSBeep();
|
|
}
|
|
|
|
bool GetLoginItemEnabled() {
|
|
BOOL enabled = NO;
|
|
#pragma clang diagnostic push
|
|
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
|
|
// SMJobCopyDictionary does not work in sandbox (see rdar://13626319)
|
|
CFArrayRef jobs = SMCopyAllJobDictionaries(kSMDomainUserLaunchd);
|
|
#pragma clang diagnostic pop
|
|
NSArray* jobs_ = CFBridgingRelease(jobs);
|
|
NSString* identifier = GetLoginHelperBundleIdentifier();
|
|
if (jobs_ && [jobs_ count] > 0) {
|
|
for (NSDictionary* job in jobs_) {
|
|
if ([identifier isEqualToString:[job objectForKey:@"Label"]]) {
|
|
enabled = [[job objectForKey:@"OnDemand"] boolValue];
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
return enabled;
|
|
}
|
|
|
|
bool SetLoginItemEnabled(bool enabled) {
|
|
NSString* identifier = GetLoginHelperBundleIdentifier();
|
|
return SMLoginItemSetEnabled((__bridge CFStringRef)identifier, enabled);
|
|
}
|
|
|
|
} // namespace platform_util
|