ccd4531bfb
* chore: bump chromium in DEPS to 117.0.5846.0 * chore: update patches * 4628901: Bump the macOS deployment target to 10.15 https://chromium-review.googlesource.com/c/chromium/src/+/4628901 * 4593350: [Private Network Access] Trigger Permission Prompt https://chromium-review.googlesource.com/c/chromium/src/+/4593350 * 4631011: Remove unlaunched "InstallReplacementAndroidApp" Platform App APIs https://chromium-review.googlesource.com/c/chromium/src/+/4631011 * chore: disable API deprecation warnings in NSKeyedArchiver * chore: update libcxx filenames * chore: bump chromium in DEPS to 117.0.5848.2 * chore: update feat_add_set_theme_source_to_allow_apps_to.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4629743 No manual changes; patch succeeded with fuzz * chore: update process_singleton.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4605398 Trivial manual patch adjustments to account for code shear. * chore: remove electron::BrowserContext::GetMediaDeviceIDSalt() Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4608130 upstream tldr: - content::BrowserContext::GetMediaDeviceIDSalt() - content::ContentBrowserClient::ArePersistentMediaDeviceIDsAllowed() + content::ContentBrowserClient::GetMediaDeviceIDSalt() This commit leaves ElectronBrowserContext::GetMediaDeviceIDSalt() in place (now non-virtual, non-override). It is now called by the new function ElectronBrowserClient::GetMediaDeviceIDSalt(). As a followup, we might want to consider using the new upstream media_device_salt::MediaDeviceSaltService and removing our electron::MediaDeviceIDSalt code. CC @MarshallOfSound for 2nd opinion since he has done the most work on MediaDeviceIDSalt and may have more context. * chore: fix iwyu breakage Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4629624 electron_browser_main_parts.cc uses ui::ColorProviderManager but didn't include it. Things worked anyway because we got it indirectly from content/public/browser/web_contents.h until 4629624. * chore: remove call to base::mac::IsAtLeastOS10_14 upstream has bumped minimum version to 10.15 so this call is moot? * chore: remove obsolete API_AVAILABLE calls in IAP upstream has bumped minimum version to 10.15 so this call is moot? * chore: remove obsolete API_AVAILABLE calls in electron_application_delegate upstream has bumped minimum version to 10.15 so this call is moot? * chore: remove broken-before-macOS-10.15 patch in mas_avoid_usage_of_private_macos_apis.patch Upstream has bumped minimum to macOS 10.15 * chore: remove @available(macOS 10.14) check Upstream minimum requirement for macOS is now 10.15 * chore: update patches * chore: bump chromium in DEPS to 117.0.5850.0 * chore: update patches * chore: bump chromium in DEPS to 117.0.5852.0 * chore: update patches * Move two params from NetworkContextParams to NetworkContextFilePaths. https://chromium-review.googlesource.com/c/chromium/src/+/4615930 * WebUSB: Add exclusionFilters to USBRequestDeviceOptions https://chromium-review.googlesource.com/c/chromium/src/+/4614682 * Convert /chrome/browser/ui to use ARC https://chromium-review.googlesource.com/c/chromium/src/+/4615920 * fixup! Bump the macOS deployment target to 10.15 * fixup! Bump the macOS deployment target to 10.15 * chore: update libcxx files * win: Remove 10Glass from Windows10Glass function and var names https://chromium-review.googlesource.com/c/chromium/src/+/4641314 * chore: revert 392e5f43 from chromium * Add an ExecutionContext to ScriptState https://chromium-review.googlesource.com/c/chromium/src/+/4609446 * fixup! Add an ExecutionContext to ScriptState * chore: fix header * Revert "chore: revert 392e5f43 from chromium" This reverts commit b7f782943e4ce83cae8cd35780d8d3618cf0772c. * fix: return correct min/max sizes in WinFrameView * fixup! Revert chore: revert 392e5f43 from chromium * fixup! Add an ExecutionContext to ScriptState * Revert "fixup! Revert chore: revert 392e5f43 from chromium" This reverts commit 7e2c7281abfc4f309255339fdba073d90a9ae3eb. * Revert "fix: return correct min/max sizes in WinFrameView" This reverts commit 3f418b1ab5155686730e087ae6cabe4a21b4bb61. * Revert "Revert "chore: revert 392e5f43 from chromium"" This reverts commit 56296d8b7c434147e032e3c3b08c0e371b6c27ba. --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: Cheng Zhao <zcbenz@gmail.com>
205 lines
7.2 KiB
Text
205 lines
7.2 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/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>
|
|
|
|
#if !defined(__has_feature) || !__has_feature(objc_arc)
|
|
#error "This file requires ARC support."
|
|
#endif
|
|
|
|
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
|