summaryrefslogtreecommitdiffstats
path: root/chrome/browser/renderer_host/render_widget_host_view_mac.h
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-19 21:19:55 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-19 21:19:55 +0000
commit34d28ddce64512e2227c566d47ca238401c57e48 (patch)
tree39832d4fc2ff46cb60572f17364a866ced071819 /chrome/browser/renderer_host/render_widget_host_view_mac.h
parent0f5a3da9fbc074bbb9c63163866ba5d806919d0d (diff)
downloadchromium_src-34d28ddce64512e2227c566d47ca238401c57e48.zip
chromium_src-34d28ddce64512e2227c566d47ca238401c57e48.tar.gz
chromium_src-34d28ddce64512e2227c566d47ca238401c57e48.tar.bz2
Make window cycling work even if you change it to something else than cmd-` in sysprefs.
Instead of just dispatching to the menu after a key comes back from the renderer, do a complete re-dispatch to NSApp (so that the event gets to the menu and cmd-` handlers) but then ignore it when it comes back to the web (because we already sent this event to the renderer once). BUG=24817 TEST=Open sysprefs, change keyboard shortcut for "Move focus to next window in active application" to e.g. cmd-\. Open two chrome windows, focus the web, hit cmd-\. It should switch windows. All other keyboard shortcuts should still work (test that ctrl-tab works when web has focus, test backspace when text field is focussed in web, when background is focussed in web, when IME is active, test hitting cmd-1/2 when omnibox or web have focus, hit cmd-left when omnibox, textbox in web, background in web has focus, test that cmd-f in docs still opens doc's find interface) Review URL: http://codereview.chromium.org/303002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29458 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/renderer_host/render_widget_host_view_mac.h')
-rw-r--r--chrome/browser/renderer_host/render_widget_host_view_mac.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/browser/renderer_host/render_widget_host_view_mac.h b/chrome/browser/renderer_host/render_widget_host_view_mac.h
index 0e76e95..38edca2 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_mac.h
+++ b/chrome/browser/renderer_host/render_widget_host_view_mac.h
@@ -42,12 +42,18 @@ class RWHVMEditCommandHelper;
void *trackingRectUserData_;
NSTrackingRectTag lastToolTipTag_;
NSString* toolTip_;
+
+ BOOL ignoreKeyEvents_;
}
- (void)setCanBeKeyView:(BOOL)can;
- (void)setCloseOnDeactivate:(BOOL)b;
- (void)setToolTipAtMousePoint:(NSString *)string;
+// When a keyboard event comes back from the renderer, we redispatch it. This
+// makes sure we ignore it if we should receive it during redispatch, instead
+// of sending it to the renderer again.
+- (void)setIgnoreKeyEvents:(BOOL)ignorekeyEvents;
@end
///////////////////////////////////////////////////////////////////////////////