Chromium Code Reviews| Index: chrome/browser/ui/cocoa/apps/native_app_window_cocoa.mm |
| diff --git a/chrome/browser/ui/cocoa/apps/native_app_window_cocoa.mm b/chrome/browser/ui/cocoa/apps/native_app_window_cocoa.mm |
| index 2260fc38535d21820f388ca86a3569d7da46417d..436243029dc525d301c998e6a6ceb953e60ca35e 100644 |
| --- a/chrome/browser/ui/cocoa/apps/native_app_window_cocoa.mm |
| +++ b/chrome/browser/ui/cocoa/apps/native_app_window_cocoa.mm |
| @@ -191,9 +191,11 @@ std::vector<gfx::Rect> CalculateNonDraggableRegions( |
| // No-op, swallow the event. |
| } |
| -- (BOOL)handledByExtensionCommand:(NSEvent*)event { |
| +- (BOOL)handledByExtensionCommand:(NSEvent*)event |
| + priority: |
| + (ui::AcceleratorManager::HandlerPriority)priority { |
|
Scott Hess - ex-Googler
2014/07/15 19:20:59
Here too.
erikchen
2014/07/15 20:48:40
Done.
|
| if (appWindow_) |
| - return appWindow_->HandledByExtensionCommand(event); |
| + return appWindow_->HandledByExtensionCommand(event, priority); |
| return NO; |
| } |
| @@ -912,9 +914,11 @@ void NativeAppWindowCocoa::WindowWillZoom() { |
| Maximize(); |
| } |
| -bool NativeAppWindowCocoa::HandledByExtensionCommand(NSEvent* event) { |
| +bool NativeAppWindowCocoa::HandledByExtensionCommand( |
| + NSEvent* event, |
| + ui::AcceleratorManager::HandlerPriority priority) { |
| return extension_keybinding_registry_->ProcessKeyEvent( |
| - content::NativeWebKeyboardEvent(event)); |
| + content::NativeWebKeyboardEvent(event), priority); |
| } |
| void NativeAppWindowCocoa::ShowWithApp() { |