Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(389)

Side by Side Diff: chrome/browser/ui/cocoa/chrome_event_processing_window.h

Issue 1255783002: [Mac] Factor out keyboard shortcut handling from ChromeEventProcessingWindow. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@execute
Patch Set: And a couple more minor comment nits. Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_UI_COCOA_CHROME_EVENT_PROCESSING_WINDOW_H_ 5 #ifndef CHROME_BROWSER_UI_COCOA_CHROME_EVENT_PROCESSING_WINDOW_H_
6 #define CHROME_BROWSER_UI_COCOA_CHROME_EVENT_PROCESSING_WINDOW_H_ 6 #define CHROME_BROWSER_UI_COCOA_CHROME_EVENT_PROCESSING_WINDOW_H_
7 7
8 #import <Cocoa/Cocoa.h> 8 #import <Cocoa/Cocoa.h>
9 9
10 #import "base/mac/scoped_nsobject.h"
11 #import "ui/base/cocoa/command_dispatcher.h"
10 #import "ui/base/cocoa/underlay_opengl_hosting_window.h" 12 #import "ui/base/cocoa/underlay_opengl_hosting_window.h"
11 13
14 @class ChromeCommandDispatcherDelegate;
15
12 // Override NSWindow to access unhandled keyboard events (for command 16 // Override NSWindow to access unhandled keyboard events (for command
13 // processing); subclassing NSWindow is the only method to do 17 // processing); subclassing NSWindow is the only method to do
14 // this. 18 // this.
15 @interface ChromeEventProcessingWindow : UnderlayOpenGLHostingWindow { 19 @interface ChromeEventProcessingWindow
20 : UnderlayOpenGLHostingWindow<CommandDispatchingWindow> {
16 @private 21 @private
17 BOOL redispatchingEvent_; 22 base::scoped_nsobject<CommandDispatcher> commandDispatcher_;
Robert Sesek 2015/08/27 23:25:23 Hide these ivars too.
jackhou1 2015/08/28 01:00:47 Done.
18 BOOL eventHandled_; 23 base::scoped_nsobject<ChromeCommandDispatcherDelegate>
24 commandDispatcherDelegate_;
19 } 25 }
20 26
21 // Sends a key event to |NSApp sendEvent:|, but also makes sure that it's not
22 // short-circuited to the RWHV. This is used to send keyboard events to the menu
23 // and the cmd-` handler if a keyboard event comes back unhandled from the
24 // renderer. The event must be of type |NSKeyDown|, |NSKeyUp|, or
25 // |NSFlagsChanged|.
26 // Returns |YES| if |event| has been handled.
27 - (BOOL)redispatchKeyEvent:(NSEvent*)event;
28
29 // Checks if |event| is a window, delayed window, or browser keyboard shortcut. 27 // Checks if |event| is a window, delayed window, or browser keyboard shortcut.
30 // (See global_keyboard_shortcuts_mac.h for details). If so, execute the 28 // (See global_keyboard_shortcuts_mac.h for details). If so, execute the
31 // associated command. Returns YES if the event was handled. 29 // associated command. Returns YES if the event was handled.
32 - (BOOL)handleExtraKeyboardShortcut:(NSEvent*)event; 30 - (BOOL)handleExtraKeyboardShortcut:(NSEvent*)event;
33 31
34 // Override, so we can handle global keyboard events.
35 - (BOOL)performKeyEquivalent:(NSEvent*)theEvent;
36
37 @end 32 @end
38 33
39 #endif // CHROME_BROWSER_UI_COCOA_CHROME_EVENT_PROCESSING_WINDOW_H_ 34 #endif // CHROME_BROWSER_UI_COCOA_CHROME_EVENT_PROCESSING_WINDOW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698