be44a2c5b7
* chore: bump chromium in DEPS to 120.0.6049.0 * chore: update patches * chore: bump chromium in DEPS to 120.0.6050.0 * chore: update patches * 4910494: Reland "[autopip] Show autopip UI for video pip" https://chromium-review.googlesource.com/c/chromium/src/+/4910494 * 4812338: Move partition_alloc into a "partition_alloc" dir. https://chromium-review.googlesource.com/c/chromium/src/+/4812338 * [Extensions Cleanup] Remove mojom ViewType::kExtensionDialog https://chromium-review.googlesource.com/c/chromium/src/+/4909897 * 4894923: Force enable raw_ptrs pointer arithmetic check. https://chromium-review.googlesource.com/c/chromium/src/+/4894923 * gin: Prevent wrappables from being constructed from author code. https://chromium-review.googlesource.com/c/chromium/src/+/4905829 * chore: update patches * chore: bump chromium in DEPS to 120.0.6052.0 * chore: bump chromium in DEPS to 120.0.6054.0 * chore: bump chromium in DEPS to 120.0.6056.0 * chore: fix patches * 4918545: Reland "[autopip] Add permissions embargo" https://chromium-review.googlesource.com/c/chromium/src/+/4918545 * 4881761: UI bindings for visual logging with structured metrics. https://chromium-review.googlesource.com/c/chromium/src/+/4881761 * chore: bump chromium in DEPS to 120.0.6058.0 * chore: update patches * chore: bump chromium in DEPS to 120.0.6060.0 * chore: bump chromium in DEPS to 120.0.6061.0 * chore: bump chromium in DEPS to 120.0.6062.0 * chore: gen libc++ filenames * chore: update patches * 4911894: Move //c/b/ui/views/eye_dropper to //components https://chromium-review.googlesource.com/c/chromium/src/+/4911894 * chore: bump chromium in DEPS to 120.0.6064.0 * chore: bump chromium in DEPS to 120.0.6066.0 * chore: bump chromium in DEPS to 120.0.6068.0 * chore: bump chromium in DEPS to 120.0.6070.0 * chore: remove temp_prevent_unused_function_error.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4931270 * chore: add TransferDragSecurityInfo() Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4928028 * mark TransferDragSecurityInfo() as NOTREACHED A follow-up to previous commit. I think this is commit is correct (i.e. that this function shouldn't get called) but am not positive, so I'm including it in a standalone commit in case we need to revert. * chore: update signature of OnPrivateNetworkAccessPermissionRequired() Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4919478 Our impl is a no-op, so updating the signature is the only change. * chore: rebuild patches * chore: bump chromium in DEPS to 120.0.6072.0 * chore: update patches * chore: sync ParseMatchPattern() param order with upstream change Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4944243 * chore: update fix_crash_loading_non-standard_schemes_in_iframes.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4939602 * chore: rebuild patches * chore: bump chromium in DEPS to 120.0.6073.0 * chore: update patches * chore: bump chromium in DEPS to 120.0.6074.0 * chore: update disable_color_correct_rendering.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4908053 no manual changes; patch applied with fuzz 1 * chore: update fix_handle_no_top_level_aura_window_in_webcontentsimpl.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4936315 minor manual sync to upstream code shear * chore: rebuild patches * chore: update ClearHttpAuthCache arguments Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4937937 adding ClearDataFilterPtr arg. Upstream added this arg, which is already present in other NetworkContext methods. Our code uses `nullptr` there. * chore: bump chromium in DEPS to 120.0.6076.0 * chore: update mas_disable_remote_accessibility.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4865412 minor manual sync to upstream code shear * chore: update disable_color_correct_rendering.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4942936 minor manual sync to upstream code shear * fix: move x11_util.h include to top of source file This is a short-term fix to unblock the roll. I will follow up a better fix in a standalone PR. * chore: rebuild patches * chore: bump chromium in DEPS to 120.0.6077.0 * chore: update patches * chore: bump chromium in DEPS to 120.0.6078.0 * chore: update patches * refactor: add BrowserProcessImpl::os_crypt_async() Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4455776 This is one to keep an eye on. This commit copies the upstream impl, which appears to be an interim step with more upstream code changes still forthcoming. Xref: https://bugs.chromium.org/p/chromium/issues/detail?id=1373092 * fixup! refactor: add BrowserProcessImpl::os_crypt_async() chore: make 'gn check' happy * chore: remove ensure_messageports_get_gced_when_not_referenced.patch Xref: ensure_messageports_get_gced_when_not_referenced.patch no longer needed because upstreamed * chore: remove webrtc/pipewire_capturer_make_restore_tokens_re-usable_more_than_one_time.patch Xref: https://webrtc-review.googlesource.com/c/src/+/322621 no longer needed because upstreamed * chore: add //components/compose:buildflags dep Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4912601 needed by browser/ui/browser_dialogs.h * chore: update filenames.libcxx.gni node ./script/gen-libc++-filenames.js * test: fix UI.InspectorView -> UI.InspectorView.instance() --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> 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: Shelley Vohr <shelley.vohr@gmail.com>
201 lines
7.1 KiB
Text
201 lines
7.1 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.
|
|
|
|
#import "shell/browser/mac/electron_application_delegate.h"
|
|
|
|
#include <memory>
|
|
#include <string>
|
|
|
|
#include "base/allocator/buildflags.h"
|
|
#include "base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim.h"
|
|
#include "base/mac/mac_util.h"
|
|
#include "base/strings/sys_string_conversions.h"
|
|
#include "base/values.h"
|
|
#include "shell/browser/api/electron_api_push_notifications.h"
|
|
#include "shell/browser/browser.h"
|
|
#include "shell/browser/mac/dict_util.h"
|
|
#import "shell/browser/mac/electron_application.h"
|
|
|
|
#import <UserNotifications/UserNotifications.h>
|
|
|
|
static NSDictionary* UNNotificationResponseToNSDictionary(
|
|
UNNotificationResponse* response) {
|
|
if (![response respondsToSelector:@selector(actionIdentifier)] ||
|
|
![response respondsToSelector:@selector(notification)]) {
|
|
return nil;
|
|
}
|
|
|
|
NSMutableDictionary* result = [[NSMutableDictionary alloc] init];
|
|
result[@"actionIdentifier"] = response.actionIdentifier;
|
|
result[@"date"] = @(response.notification.date.timeIntervalSince1970);
|
|
result[@"identifier"] = response.notification.request.identifier;
|
|
result[@"userInfo"] = response.notification.request.content.userInfo;
|
|
|
|
// [response isKindOfClass:[UNTextInputNotificationResponse class]]
|
|
if ([response respondsToSelector:@selector(userText)]) {
|
|
result[@"userText"] =
|
|
static_cast<UNTextInputNotificationResponse*>(response).userText;
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
@implementation ElectronApplicationDelegate {
|
|
ElectronMenuController* __strong menu_controller_;
|
|
}
|
|
|
|
- (void)setApplicationDockMenu:(electron::ElectronMenuModel*)model {
|
|
menu_controller_ = [[ElectronMenuController alloc] initWithModel:model
|
|
useDefaultAccelerator:NO];
|
|
}
|
|
|
|
- (void)willPowerOff:(NSNotification*)notify {
|
|
[[AtomApplication sharedApplication] willPowerOff:notify];
|
|
}
|
|
|
|
- (void)applicationWillFinishLaunching:(NSNotification*)notify {
|
|
// Don't add the "Enter Full Screen" menu item automatically.
|
|
[[NSUserDefaults standardUserDefaults]
|
|
setBool:NO
|
|
forKey:@"NSFullScreenMenuItemEverywhere"];
|
|
|
|
[[[NSWorkspace sharedWorkspace] notificationCenter]
|
|
addObserver:self
|
|
selector:@selector(willPowerOff:)
|
|
name:NSWorkspaceWillPowerOffNotification
|
|
object:nil];
|
|
|
|
electron::Browser::Get()->WillFinishLaunching();
|
|
}
|
|
|
|
- (void)applicationDidFinishLaunching:(NSNotification*)notify {
|
|
NSObject* user_notification =
|
|
[notify userInfo][NSApplicationLaunchUserNotificationKey];
|
|
NSDictionary* notification_info = nil;
|
|
|
|
if (user_notification) {
|
|
if ([user_notification isKindOfClass:[NSUserNotification class]]) {
|
|
notification_info =
|
|
[static_cast<NSUserNotification*>(user_notification) userInfo];
|
|
} else {
|
|
notification_info = UNNotificationResponseToNSDictionary(
|
|
static_cast<UNNotificationResponse*>(user_notification));
|
|
}
|
|
}
|
|
|
|
electron::Browser::Get()->DidFinishLaunching(
|
|
electron::NSDictionaryToValue(notification_info));
|
|
}
|
|
|
|
- (void)applicationDidBecomeActive:(NSNotification*)notification {
|
|
electron::Browser::Get()->DidBecomeActive();
|
|
}
|
|
|
|
- (void)applicationDidResignActive:(NSNotification*)notification {
|
|
electron::Browser::Get()->DidResignActive();
|
|
}
|
|
|
|
- (NSMenu*)applicationDockMenu:(NSApplication*)sender {
|
|
return menu_controller_ ? menu_controller_.menu : nil;
|
|
}
|
|
|
|
- (BOOL)application:(NSApplication*)sender openFile:(NSString*)filename {
|
|
std::string filename_str(base::SysNSStringToUTF8(filename));
|
|
return electron::Browser::Get()->OpenFile(filename_str) ? YES : NO;
|
|
}
|
|
|
|
- (BOOL)applicationShouldHandleReopen:(NSApplication*)theApplication
|
|
hasVisibleWindows:(BOOL)flag {
|
|
electron::Browser* browser = electron::Browser::Get();
|
|
browser->Activate(static_cast<bool>(flag));
|
|
return flag;
|
|
}
|
|
|
|
- (BOOL)application:(NSApplication*)sender
|
|
continueUserActivity:(NSUserActivity*)userActivity
|
|
restorationHandler:
|
|
#ifdef MAC_OS_X_VERSION_10_14
|
|
(void (^)(NSArray<id<NSUserActivityRestoring>>* restorableObjects))
|
|
#else
|
|
(void (^)(NSArray* restorableObjects))
|
|
#endif
|
|
restorationHandler {
|
|
std::string activity_type(base::SysNSStringToUTF8(userActivity.activityType));
|
|
NSURL* url = userActivity.webpageURL;
|
|
NSDictionary* details = url ? @{@"webpageURL" : url.absoluteString} : @{};
|
|
if (!userActivity.userInfo)
|
|
return NO;
|
|
|
|
electron::Browser* browser = electron::Browser::Get();
|
|
return browser->ContinueUserActivity(
|
|
activity_type,
|
|
electron::NSDictionaryToValue(userActivity.userInfo),
|
|
electron::NSDictionaryToValue(details))
|
|
? YES
|
|
: NO;
|
|
}
|
|
|
|
- (BOOL)application:(NSApplication*)application
|
|
willContinueUserActivityWithType:(NSString*)userActivityType {
|
|
std::string activity_type(base::SysNSStringToUTF8(userActivityType));
|
|
|
|
electron::Browser* browser = electron::Browser::Get();
|
|
return browser->WillContinueUserActivity(activity_type) ? YES : NO;
|
|
}
|
|
|
|
- (void)application:(NSApplication*)application
|
|
didFailToContinueUserActivityWithType:(NSString*)userActivityType
|
|
error:(NSError*)error {
|
|
std::string activity_type(base::SysNSStringToUTF8(userActivityType));
|
|
std::string error_message(
|
|
base::SysNSStringToUTF8(error.localizedDescription));
|
|
|
|
electron::Browser* browser = electron::Browser::Get();
|
|
browser->DidFailToContinueUserActivity(activity_type, error_message);
|
|
}
|
|
|
|
- (IBAction)newWindowForTab:(id)sender {
|
|
electron::Browser::Get()->NewWindowForTab();
|
|
}
|
|
|
|
- (void)application:(NSApplication*)application
|
|
didRegisterForRemoteNotificationsWithDeviceToken:(NSData*)deviceToken {
|
|
// https://stackoverflow.com/a/16411517
|
|
const char* token_data = static_cast<const char*>(deviceToken.bytes);
|
|
NSMutableString* token_string = [NSMutableString string];
|
|
for (NSUInteger i = 0; i < deviceToken.length; i++) {
|
|
[token_string appendFormat:@"%02.2hhX", token_data[i]];
|
|
}
|
|
// Resolve outstanding APNS promises created during registration attempts
|
|
electron::api::PushNotifications* push_notifications =
|
|
electron::api::PushNotifications::Get();
|
|
if (push_notifications) {
|
|
push_notifications->ResolveAPNSPromiseSetWithToken(
|
|
base::SysNSStringToUTF8(token_string));
|
|
}
|
|
}
|
|
|
|
- (void)application:(NSApplication*)application
|
|
didFailToRegisterForRemoteNotificationsWithError:(NSError*)error {
|
|
std::string error_message(base::SysNSStringToUTF8(
|
|
[NSString stringWithFormat:@"%ld %@ %@", error.code, error.domain,
|
|
error.userInfo]));
|
|
electron::api::PushNotifications* push_notifications =
|
|
electron::api::PushNotifications::Get();
|
|
if (push_notifications) {
|
|
push_notifications->RejectAPNSPromiseSetWithError(error_message);
|
|
}
|
|
}
|
|
|
|
- (void)application:(NSApplication*)application
|
|
didReceiveRemoteNotification:(NSDictionary*)userInfo {
|
|
electron::api::PushNotifications* push_notifications =
|
|
electron::api::PushNotifications::Get();
|
|
if (push_notifications) {
|
|
electron::api::PushNotifications::Get()->OnDidReceiveAPNSNotification(
|
|
electron::NSDictionaryToValue(userInfo));
|
|
}
|
|
}
|
|
|
|
@end
|