Chromium Code Reviews| Index: chrome/browser/ui/cocoa/chrome_event_processing_window.h |
| diff --git a/chrome/browser/ui/cocoa/chrome_event_processing_window.h b/chrome/browser/ui/cocoa/chrome_event_processing_window.h |
| index 0f6dfb1dfc2565757528a5cc86284cdcd07697d8..0ab442fed3fa9c47c42a8a6e9d57bd6bc17f3675 100644 |
| --- a/chrome/browser/ui/cocoa/chrome_event_processing_window.h |
| +++ b/chrome/browser/ui/cocoa/chrome_event_processing_window.h |
| @@ -7,17 +7,23 @@ |
| #import <Cocoa/Cocoa.h> |
| +#import "base/mac/scoped_nsobject.h" |
| #import "ui/base/cocoa/underlay_opengl_hosting_window.h" |
| +@protocol CommandDispatchDelegate; |
|
tapted
2015/07/31 03:06:50
with the commandDelegate accessor removed, this ca
jackhou1
2015/08/04 01:03:58
Done.
|
| + |
| +@class ChromeCommandDispatchDelegate; |
| + |
| // Override NSWindow to access unhandled keyboard events (for command |
| // processing); subclassing NSWindow is the only method to do |
| // this. |
| @interface ChromeEventProcessingWindow : UnderlayOpenGLHostingWindow { |
| @private |
| - BOOL redispatchingEvent_; |
| - BOOL eventHandled_; |
| + base::scoped_nsobject<ChromeCommandDispatchDelegate> commandDelegate_; |
| } |
| +- (id<CommandDispatchDelegate>)commandDelegate; |
| + |
| // Sends a key event to |NSApp sendEvent:|, but also makes sure that it's not |
| // short-circuited to the RWHV. This is used to send keyboard events to the menu |
| // and the cmd-` handler if a keyboard event comes back unhandled from the |
| @@ -26,13 +32,9 @@ |
| // Returns |YES| if |event| has been handled. |
| - (BOOL)redispatchKeyEvent:(NSEvent*)event; |
| -// Checks if |event| is a window, delayed window, or browser keyboard shortcut. |
| -// (See global_keyboard_shortcuts_mac.h for details). If so, execute the |
| -// associated command. Returns YES if the event was handled. |
| -- (BOOL)handleExtraKeyboardShortcut:(NSEvent*)event; |
| - |
| -// Override, so we can handle global keyboard events. |
| -- (BOOL)performKeyEquivalent:(NSEvent*)theEvent; |
| +// NSWindow overrides: |
|
tapted
2015/07/31 03:06:50
These don't need to be redeclared in the header
jackhou1
2015/08/04 01:03:58
Done.
|
| +- (BOOL)performKeyEquivalent:(NSEvent*)event; |
| +- (void)sendEvent:(NSEvent*)event; |
| @end |