From b57b342352d1cc5d9c7fb49cb9be42397e9d231c Mon Sep 17 00:00:00 2001 From: Jeremy Apthorp Date: Tue, 2 Oct 2018 15:22:48 -0700 Subject: [PATCH] Remove PlatformAccelerator https://chromium-review.googlesource.com/c/chromium/src/+/1140211 --- atom/browser/ui/accelerator_util.cc | 1 - atom/browser/ui/accelerator_util.h | 3 -- atom/browser/ui/accelerator_util_mac.mm | 46 ------------------- atom/browser/ui/accelerator_util_views.cc | 13 ------ atom/browser/ui/cocoa/atom_menu_controller.mm | 14 +++--- filenames.gni | 2 - 6 files changed, 6 insertions(+), 73 deletions(-) delete mode 100644 atom/browser/ui/accelerator_util_mac.mm delete mode 100644 atom/browser/ui/accelerator_util_views.cc diff --git a/atom/browser/ui/accelerator_util.cc b/atom/browser/ui/accelerator_util.cc index 0a6c523356..c0d14c01e8 100644 --- a/atom/browser/ui/accelerator_util.cc +++ b/atom/browser/ui/accelerator_util.cc @@ -64,7 +64,6 @@ bool StringToAccelerator(const std::string& shortcut, } *accelerator = ui::Accelerator(key, modifiers); - SetPlatformAccelerator(accelerator); return true; } diff --git a/atom/browser/ui/accelerator_util.h b/atom/browser/ui/accelerator_util.h index c965e5da0b..f498e0240a 100644 --- a/atom/browser/ui/accelerator_util.h +++ b/atom/browser/ui/accelerator_util.h @@ -23,9 +23,6 @@ typedef std::map AcceleratorTable; bool StringToAccelerator(const std::string& description, ui::Accelerator* accelerator); -// Set platform accelerator for the Accelerator. -void SetPlatformAccelerator(ui::Accelerator* accelerator); - // Generate a table that contains memu model's accelerators and command ids. void GenerateAcceleratorTable(AcceleratorTable* table, atom::AtomMenuModel* model); diff --git a/atom/browser/ui/accelerator_util_mac.mm b/atom/browser/ui/accelerator_util_mac.mm deleted file mode 100644 index 51ac1c4db8..0000000000 --- a/atom/browser/ui/accelerator_util_mac.mm +++ /dev/null @@ -1,46 +0,0 @@ -// 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 "atom/browser/ui/accelerator_util.h" - -#include "ui/base/accelerators/accelerator.h" -#import "ui/base/accelerators/platform_accelerator_cocoa.h" -#import "ui/events/keycodes/keyboard_code_conversion_mac.h" - -namespace accelerator_util { - -void SetPlatformAccelerator(ui::Accelerator* accelerator) { - unichar character; - unichar characterIgnoringModifiers; - - NSUInteger modifiers = (accelerator->IsCtrlDown() ? NSControlKeyMask : 0) | - (accelerator->IsCmdDown() ? NSCommandKeyMask : 0) | - (accelerator->IsAltDown() ? NSAlternateKeyMask : 0) | - (accelerator->IsShiftDown() ? NSShiftKeyMask : 0); - - ui::MacKeyCodeForWindowsKeyCode(accelerator->key_code(), modifiers, - &character, &characterIgnoringModifiers); - - if (character != characterIgnoringModifiers) { - if (isdigit(characterIgnoringModifiers)) { - // The character is a number so lets not mutate it with the modifiers - character = characterIgnoringModifiers; - } else { - modifiers ^= NSShiftKeyMask; - } - } - - if (character == NSDeleteFunctionKey) { - character = NSDeleteCharacter; - } - - NSString* characters = - [[[NSString alloc] initWithCharacters:&character length:1] autorelease]; - - std::unique_ptr platform_accelerator( - new ui::PlatformAcceleratorCocoa(characters, modifiers)); - accelerator->set_platform_accelerator(std::move(platform_accelerator)); -} - -} // namespace accelerator_util diff --git a/atom/browser/ui/accelerator_util_views.cc b/atom/browser/ui/accelerator_util_views.cc deleted file mode 100644 index 086e7084c4..0000000000 --- a/atom/browser/ui/accelerator_util_views.cc +++ /dev/null @@ -1,13 +0,0 @@ -// 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 "atom/browser/ui/accelerator_util.h" - -#include "ui/base/accelerators/accelerator.h" - -namespace accelerator_util { - -void SetPlatformAccelerator(ui::Accelerator* accelerator) {} - -} // namespace accelerator_util diff --git a/atom/browser/ui/cocoa/atom_menu_controller.mm b/atom/browser/ui/cocoa/atom_menu_controller.mm index 652c92dbeb..3286b3f56b 100644 --- a/atom/browser/ui/cocoa/atom_menu_controller.mm +++ b/atom/browser/ui/cocoa/atom_menu_controller.mm @@ -239,14 +239,12 @@ static base::scoped_nsobject recentDocumentsMenuSwap_; ui::Accelerator accelerator; if (model->GetAcceleratorAtWithParams(index, useDefaultAccelerator_, &accelerator)) { - const ui::PlatformAcceleratorCocoa* platformAccelerator = - static_cast( - accelerator.platform_accelerator()); - if (platformAccelerator) { - [item setKeyEquivalent:platformAccelerator->characters()]; - [item - setKeyEquivalentModifierMask:platformAccelerator->modifier_mask()]; - } + NSString* key_equivalent; + NSUInteger modifier_mask; + GetKeyEquivalentAndModifierMaskFromAccelerator( + accelerator, &key_equivalent, &modifier_mask); + [item setKeyEquivalent:key_equivalent]; + [item setKeyEquivalentModifierMask:modifier_mask]; } // Set menu item's role. diff --git a/filenames.gni b/filenames.gni index e7f080e071..5405492f18 100644 --- a/filenames.gni +++ b/filenames.gni @@ -336,8 +336,6 @@ filenames = { "atom/browser/special_storage_policy.h", "atom/browser/ui/accelerator_util.cc", "atom/browser/ui/accelerator_util.h", - "atom/browser/ui/accelerator_util_mac.mm", - "atom/browser/ui/accelerator_util_views.cc", "atom/browser/ui/atom_menu_model.cc", "atom/browser/ui/atom_menu_model.h", "atom/browser/ui/autofill_popup.cc",