bbdd037219
* chore: bump chromium in DEPS to 117.0.5892.0 * 4670267: Don't send javascript: or empty URLs to browser in CreateNewWindow. https://chromium-review.googlesource.com/c/chromium/src/+/4670267 * 4662090: Add metrics for WebGPU support https://chromium-review.googlesource.com/c/chromium/src/+/4662090 * 4672599: Use set_defaults for mac_app_bundle https://chromium-review.googlesource.com/c/chromium/src/+/4672599 * 4663771: usb: Add connection count tracking methods for UsbDelegate https://chromium-review.googlesource.com/c/chromium/src/+/4663771 * 4664578: Remove unused parameter from ExtensionsGuestViewManagerDelegate ctor https://chromium-review.googlesource.com/c/chromium/src/+/4664578 * 4622253: usb: Create classes for usb system tray icon https://chromium-review.googlesource.com/c/chromium/src/+/4622253 * 4678263: Remove ARC support from scoped_nsobject https://chromium-review.googlesource.com/c/chromium/src/+/4678263 * chore: follow-up ARC changes and missing guard corrections * chore: don't mark 0-param ctor explicit Follow up to https://chromium-review.googlesource.com/c/chromium/src/+/4664578 * chore: fixup patch indices * 4670865: Merge ObjectProxy::CallMethodAndBlock{,WithErrorDetails}. https://chromium-review.googlesource.com/c/chromium/src/+/4670865 * chore: follow-up ARC changes and missing guard corrections * fixup: retain ElectronApplicationDelegate * fix: correct rustc binary --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
255 lines
7.9 KiB
Text
255 lines
7.9 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.h"
|
|
|
|
#include <string>
|
|
#include <utility>
|
|
|
|
#include "base/auto_reset.h"
|
|
#include "base/observer_list.h"
|
|
#include "base/strings/sys_string_conversions.h"
|
|
#include "content/public/browser/browser_accessibility_state.h"
|
|
#include "content/public/browser/native_event_processor_mac.h"
|
|
#include "content/public/browser/native_event_processor_observer_mac.h"
|
|
#include "shell/browser/browser.h"
|
|
#include "shell/browser/mac/dict_util.h"
|
|
#import "shell/browser/mac/electron_application_delegate.h"
|
|
|
|
namespace {
|
|
|
|
inline void dispatch_sync_main(dispatch_block_t block) {
|
|
if ([NSThread isMainThread])
|
|
block();
|
|
else
|
|
dispatch_sync(dispatch_get_main_queue(), block);
|
|
}
|
|
|
|
} // namespace
|
|
|
|
@interface AtomApplication () <NativeEventProcessor> {
|
|
base::ObserverList<content::NativeEventProcessorObserver>::Unchecked
|
|
observers_;
|
|
}
|
|
@end
|
|
|
|
@implementation AtomApplication
|
|
|
|
+ (AtomApplication*)sharedApplication {
|
|
return (AtomApplication*)[super sharedApplication];
|
|
}
|
|
|
|
- (void)willPowerOff:(NSNotification*)notify {
|
|
userStoppedShutdown_ = shouldShutdown_ && !shouldShutdown_.Run();
|
|
}
|
|
|
|
- (void)terminate:(id)sender {
|
|
// User will call Quit later.
|
|
if (userStoppedShutdown_)
|
|
return;
|
|
|
|
// We simply try to close the browser, which in turn will try to close the
|
|
// windows. Termination can proceed if all windows are closed or window close
|
|
// can be cancelled which will abort termination.
|
|
electron::Browser::Get()->Quit();
|
|
}
|
|
|
|
- (void)setShutdownHandler:(base::RepeatingCallback<bool()>)handler {
|
|
shouldShutdown_ = std::move(handler);
|
|
}
|
|
|
|
- (BOOL)isHandlingSendEvent {
|
|
return handlingSendEvent_;
|
|
}
|
|
|
|
- (void)sendEvent:(NSEvent*)event {
|
|
base::AutoReset<BOOL> scoper(&handlingSendEvent_, YES);
|
|
content::ScopedNotifyNativeEventProcessorObserver scopedObserverNotifier(
|
|
&observers_, event);
|
|
[super sendEvent:event];
|
|
}
|
|
|
|
- (void)setHandlingSendEvent:(BOOL)handlingSendEvent {
|
|
handlingSendEvent_ = handlingSendEvent;
|
|
}
|
|
|
|
- (void)setCurrentActivity:(NSString*)type
|
|
withUserInfo:(NSDictionary*)userInfo
|
|
withWebpageURL:(NSURL*)webpageURL {
|
|
currentActivity_ = [[NSUserActivity alloc] initWithActivityType:type];
|
|
[currentActivity_ setUserInfo:userInfo];
|
|
[currentActivity_ setWebpageURL:webpageURL];
|
|
[currentActivity_ setDelegate:self];
|
|
[currentActivity_ becomeCurrent];
|
|
[currentActivity_ setNeedsSave:YES];
|
|
}
|
|
|
|
- (NSUserActivity*)getCurrentActivity {
|
|
return currentActivity_;
|
|
}
|
|
|
|
- (void)invalidateCurrentActivity {
|
|
if (currentActivity_) {
|
|
[currentActivity_ invalidate];
|
|
currentActivity_ = nil;
|
|
}
|
|
}
|
|
|
|
- (void)resignCurrentActivity {
|
|
if (currentActivity_)
|
|
[currentActivity_ resignCurrent];
|
|
}
|
|
|
|
- (void)updateCurrentActivity:(NSString*)type
|
|
withUserInfo:(NSDictionary*)userInfo {
|
|
if (currentActivity_) {
|
|
[currentActivity_ addUserInfoEntriesFromDictionary:userInfo];
|
|
}
|
|
|
|
[handoffLock_ lock];
|
|
updateReceived_ = YES;
|
|
[handoffLock_ signal];
|
|
[handoffLock_ unlock];
|
|
}
|
|
|
|
- (void)userActivityWillSave:(NSUserActivity*)userActivity {
|
|
__block BOOL shouldWait = NO;
|
|
dispatch_sync_main(^{
|
|
std::string activity_type(
|
|
base::SysNSStringToUTF8(userActivity.activityType));
|
|
base::Value::Dict user_info =
|
|
electron::NSDictionaryToValue(userActivity.userInfo);
|
|
|
|
electron::Browser* browser = electron::Browser::Get();
|
|
shouldWait =
|
|
browser->UpdateUserActivityState(activity_type, std::move(user_info))
|
|
? YES
|
|
: NO;
|
|
});
|
|
|
|
if (shouldWait) {
|
|
[handoffLock_ lock];
|
|
updateReceived_ = NO;
|
|
while (!updateReceived_) {
|
|
BOOL isSignaled =
|
|
[handoffLock_ waitUntilDate:[NSDate dateWithTimeIntervalSinceNow:1]];
|
|
if (!isSignaled)
|
|
break;
|
|
}
|
|
[handoffLock_ unlock];
|
|
}
|
|
|
|
[userActivity setNeedsSave:YES];
|
|
}
|
|
|
|
- (void)userActivityWasContinued:(NSUserActivity*)userActivity {
|
|
dispatch_async(dispatch_get_main_queue(), ^{
|
|
std::string activity_type(
|
|
base::SysNSStringToUTF8(userActivity.activityType));
|
|
base::Value::Dict user_info =
|
|
electron::NSDictionaryToValue(userActivity.userInfo);
|
|
|
|
electron::Browser* browser = electron::Browser::Get();
|
|
browser->UserActivityWasContinued(activity_type, std::move(user_info));
|
|
});
|
|
[userActivity setNeedsSave:YES];
|
|
}
|
|
|
|
- (void)registerURLHandler {
|
|
[[NSAppleEventManager sharedAppleEventManager]
|
|
setEventHandler:self
|
|
andSelector:@selector(handleURLEvent:withReplyEvent:)
|
|
forEventClass:kInternetEventClass
|
|
andEventID:kAEGetURL];
|
|
|
|
handoffLock_ = [NSCondition new];
|
|
}
|
|
|
|
- (void)handleURLEvent:(NSAppleEventDescriptor*)event
|
|
withReplyEvent:(NSAppleEventDescriptor*)replyEvent {
|
|
NSString* url =
|
|
[[event paramDescriptorForKeyword:keyDirectObject] stringValue];
|
|
electron::Browser::Get()->OpenURL(base::SysNSStringToUTF8(url));
|
|
}
|
|
|
|
// Returns the list of accessibility attributes that this object supports.
|
|
- (NSArray*)accessibilityAttributeNames {
|
|
NSMutableArray* attributes =
|
|
[[super accessibilityAttributeNames] mutableCopy];
|
|
[attributes addObject:@"AXManualAccessibility"];
|
|
return attributes;
|
|
}
|
|
|
|
// Returns whether or not the specified attribute can be set by the
|
|
// accessibility API via |accessibilitySetValue:forAttribute:|.
|
|
- (BOOL)accessibilityIsAttributeSettable:(NSString*)attribute {
|
|
bool is_manual_ax = [attribute isEqualToString:@"AXManualAccessibility"];
|
|
return is_manual_ax || [super accessibilityIsAttributeSettable:attribute];
|
|
}
|
|
|
|
// Returns the accessibility value for the given attribute. If the value isn't
|
|
// supported this will return nil.
|
|
- (id)accessibilityAttributeValue:(NSString*)attribute {
|
|
if ([attribute isEqualToString:@"AXManualAccessibility"]) {
|
|
auto* ax_state = content::BrowserAccessibilityState::GetInstance();
|
|
return [NSNumber numberWithBool:ax_state->IsAccessibleBrowser()];
|
|
}
|
|
|
|
return [super accessibilityAttributeValue:attribute];
|
|
}
|
|
|
|
// Sets the value for an accessibility attribute via the accessibility API.
|
|
// AXEnhancedUserInterface is an undocumented attribute that screen reader
|
|
// related functionality sets when running, and AXManualAccessibility is an
|
|
// attribute Electron specifically allows third-party apps to use to enable
|
|
// a11y features in Electron.
|
|
- (void)accessibilitySetValue:(id)value forAttribute:(NSString*)attribute {
|
|
bool is_manual_ax = [attribute isEqualToString:@"AXManualAccessibility"];
|
|
if ([attribute isEqualToString:@"AXEnhancedUserInterface"] || is_manual_ax) {
|
|
auto* ax_state = content::BrowserAccessibilityState::GetInstance();
|
|
if ([value boolValue]) {
|
|
ax_state->OnScreenReaderDetected();
|
|
} else {
|
|
ax_state->DisableAccessibility();
|
|
}
|
|
|
|
electron::Browser::Get()->OnAccessibilitySupportChanged();
|
|
|
|
// Don't call the superclass function for AXManualAccessibility,
|
|
// as it will log an AXError and make it appear as though the attribute
|
|
// failed to take effect.
|
|
if (is_manual_ax)
|
|
return;
|
|
}
|
|
|
|
return [super accessibilitySetValue:value forAttribute:attribute];
|
|
}
|
|
|
|
- (NSAccessibilityRole)accessibilityRole {
|
|
// For non-VoiceOver AT, such as Voice Control, Apple recommends turning on
|
|
// a11y when an AT accesses the 'accessibilityRole' property. This function
|
|
// is accessed frequently so we only change the accessibility state when
|
|
// accessibility is disabled.
|
|
auto* ax_state = content::BrowserAccessibilityState::GetInstance();
|
|
if (!ax_state->GetAccessibilityMode().has_mode(ui::kAXModeBasic.flags())) {
|
|
ax_state->AddAccessibilityModeFlags(ui::kAXModeBasic);
|
|
}
|
|
return [super accessibilityRole];
|
|
}
|
|
|
|
- (void)orderFrontStandardAboutPanel:(id)sender {
|
|
electron::Browser::Get()->ShowAboutPanel();
|
|
}
|
|
|
|
- (void)addNativeEventProcessorObserver:
|
|
(content::NativeEventProcessorObserver*)observer {
|
|
observers_.AddObserver(observer);
|
|
}
|
|
|
|
- (void)removeNativeEventProcessorObserver:
|
|
(content::NativeEventProcessorObserver*)observer {
|
|
observers_.RemoveObserver(observer);
|
|
}
|
|
|
|
@end
|