mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

chore: bump chromium to 117.0.5892.0 (main) (#39118)

Browse source 
* chore: bump chromium in DEPS to 117.0.5892.0

* 4670267: Don't send javascript: or empty URLs to browser in CreateNewWindow.

4670267

* 4662090: Add metrics for WebGPU support

4662090

* 4672599: Use set_defaults for mac_app_bundle

4672599

* 4663771: usb: Add connection count tracking methods for UsbDelegate

4663771

* 4664578: Remove unused parameter from ExtensionsGuestViewManagerDelegate ctor

4664578

* 4622253: usb: Create classes for usb system tray icon

4622253

* 4678263: Remove ARC support from scoped_nsobject

4678263

* chore: follow-up ARC changes and missing guard corrections

* chore: don't mark 0-param ctor explicit

Follow up to 4664578

* chore: fixup patch indices

* 4670865: Merge ObjectProxy::CallMethodAndBlock{,WithErrorDetails}.

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>
This commit is contained in:
electron-roller[bot] 2023-07-19 00:26:27 +02:00 • committed by GitHub
parent ee4460ac68
commit bbdd037219
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
77 changed files with 389 additions and 353 deletions
Download patch file Download diff file Expand all files Collapse all files

28
shell/browser/api/electron_api_menu_mac.mm
View file

@ -20,7 +20,7 @@
namespace {
static scoped_nsobject<NSMenu> applicationMenu_;
static NSMenu* __strong applicationMenu_;
ui::Accelerator GetAcceleratorFromKeyEquivalentAndModifierMask(
NSString* key_equivalent,
@ -75,16 +75,15 @@ v8::Local<v8::Value> Menu::GetUserAcceleratorAt(int command_id) const {
if (![NSMenuItem usesUserKeyEquivalents])
return v8::Null(isolate);
auto controller = base::scoped_nsobject<ElectronMenuController>(
[[ElectronMenuController alloc] initWithModel:model()
useDefaultAccelerator:NO]);
auto controller = [[ElectronMenuController alloc] initWithModel:model()
useDefaultAccelerator:NO];
int command_index = GetIndexOfCommandId(command_id);
if (command_index == -1)
return v8::Null(isolate);
base::scoped_nsobject<NSMenuItem> item =
[controller makeMenuItemForIndex:command_index fromModel:model()];
NSMenuItem* item = [controller makeMenuItemForIndex:command_index
fromModel:model()];
if ([[item userKeyEquivalent] length] == 0)
return v8::Null(isolate);
@ -109,9 +108,9 @@ void MenuMac::PopupOnUI(const base::WeakPtr<NativeWindow>& native_window,
base::OnceClosure close_callback =
base::BindOnce(&MenuMac::OnClosed, weak_factory_.GetWeakPtr(), window_id,
std::move(callback));
popup_controllers_[window_id] = base::scoped_nsobject<ElectronMenuController>(
popup_controllers_[window_id] =
[[ElectronMenuController alloc] initWithModel:model()
useDefaultAccelerator:NO]);
useDefaultAccelerator:NO];
NSMenu* menu = [popup_controllers_[window_id] menu];
NSView* view = [nswindow contentView];
@ -171,9 +170,9 @@ void MenuMac::ClosePopupAt(int32_t window_id) {
std::u16string MenuMac::GetAcceleratorTextAtForTesting(int index) const {
// A least effort to get the real shortcut text of NSMenuItem, the code does
// not need to be perfect since it is test only.
base::scoped_nsobject<ElectronMenuController> controller(
ElectronMenuController* controller =
[[ElectronMenuController alloc] initWithModel:model()
useDefaultAccelerator:NO]);
useDefaultAccelerator:NO];
NSMenuItem* item = [[controller menu] itemAtIndex:index];
std::u16string text;
NSEventModifierFlags modifiers = [item keyEquivalentModifierMask];
@ -227,15 +226,15 @@ void MenuMac::OnClosed(int32_t window_id, base::OnceClosure callback) {
// static
void Menu::SetApplicationMenu(Menu* base_menu) {
MenuMac* menu = static_cast<MenuMac*>(base_menu);
base::scoped_nsobject<ElectronMenuController> menu_controller(
ElectronMenuController* menu_controller =
[[ElectronMenuController alloc] initWithModel:menu->model_.get()
useDefaultAccelerator:YES]);
useDefaultAccelerator:YES];
NSRunLoop* currentRunLoop = [NSRunLoop currentRunLoop];
[currentRunLoop cancelPerformSelector:@selector(setMainMenu:)
target:NSApp
argument:applicationMenu_];
applicationMenu_.reset([[menu_controller menu] retain]);
applicationMenu_ = [menu_controller menu];
[[NSRunLoop currentRunLoop]
performSelector:@selector(setMainMenu:)
target:NSApp
@ -243,8 +242,7 @@ void Menu::SetApplicationMenu(Menu* base_menu) {
order:0
modes:[NSArray arrayWithObject:NSDefaultRunLoopMode]];
// Ensure the menu_controller_ is destroyed after main menu is set.
menu_controller.swap(menu->menu_controller_);
menu->menu_controller_ = menu_controller;
}
// static