| Index: chrome/browser/ui/cocoa/accelerator_utils_cocoa.mm
|
| diff --git a/chrome/browser/ui/cocoa/accelerator_utils_cocoa.mm b/chrome/browser/ui/cocoa/accelerator_utils_cocoa.mm
|
| index 7cfa92bb81a09cfd61696edd770c923ce5788be3..294536f20cc6208567d95aef6adaa11d9a60aa59 100644
|
| --- a/chrome/browser/ui/cocoa/accelerator_utils_cocoa.mm
|
| +++ b/chrome/browser/ui/cocoa/accelerator_utils_cocoa.mm
|
| @@ -2,10 +2,12 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "chrome/browser/profiles/profile.h"
|
| +#include "chrome/browser/ui/accelerator_utils.h"
|
| +
|
| +#import <Cocoa/Cocoa.h>
|
| +
|
| +#include "chrome/browser/global_keyboard_shortcuts_mac.h"
|
| #include "chrome/browser/ui/cocoa/accelerators_cocoa.h"
|
| -#import "chrome/browser/ui/cocoa/browser_window_utils.h"
|
| -#include "content/public/browser/native_web_keyboard_event.h"
|
| #include "ui/base/accelerators/accelerator.h"
|
| #import "ui/base/accelerators/platform_accelerator_cocoa.h"
|
| #import "ui/events/keycodes/keyboard_code_conversion_mac.h"
|
| @@ -43,9 +45,7 @@ bool IsChromeAccelerator(const ui::Accelerator& accelerator, Profile* profile) {
|
| isARepeat:NO
|
| keyCode:accelerator.key_code()];
|
|
|
| - content::NativeWebKeyboardEvent keyboard_event(event);
|
| - int id = [BrowserWindowUtils getCommandId:keyboard_event];
|
| - return id != -1;
|
| + return CommandForKeyEvent(event) != -1;
|
| }
|
|
|
| ui::Accelerator GetPrimaryChromeAcceleratorForCommandId(int command_id) {
|
|
|