diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-25 04:53:09 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-25 04:53:09 +0000 |
| commit | 3fe4381580b1cf5ed2637aeb6bea25e86e1db9b4 (patch) | |
| tree | de2ed77b84e67b6453a169eaf9ee5dcede0a5d8c /chrome/browser/ui/cocoa/browser_window_cocoa.h | |
| parent | ff71e6483669362f5060598214afc1a594427bce (diff) | |
| download | chromium_src-3fe4381580b1cf5ed2637aeb6bea25e86e1db9b4.zip chromium_src-3fe4381580b1cf5ed2637aeb6bea25e86e1db9b4.tar.gz chromium_src-3fe4381580b1cf5ed2637aeb6bea25e86e1db9b4.tar.bz2 | |
Revert 98112
BrowserKeyEventsTest.ReservedAccelerators started failing, and this looks
like the most likely candidate in the window:
http://build.chromium.org/p/chromium/builders/Mac%2010.6%20Tests%20%28dbg%29%281%29/builds/14075
http://build.chromium.org/p/chromium/builders/Mac%2010.5%20Tests%20%28dbg%29%281%29/builds/12226
- Handle keyboard shortcuts in Mac Panels.
Common code from browser_window_cocoa separated into cocoa/browser_window_utils.
Panel.xib changed to make the NSWindow for the PanelWindowControllerCocoa a ChromeEventProcessingWindow.
BUG=None
TEST=Manual testing with Panels and keyboard shortcuts to find/next/previous/close window/quit chrome.
Review URL: http://codereview.chromium.org/7719016
TBR=jennb@chromium.org
Review URL: http://codereview.chromium.org/7747011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98186 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/cocoa/browser_window_cocoa.h')
| -rw-r--r-- | chrome/browser/ui/cocoa/browser_window_cocoa.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/browser/ui/cocoa/browser_window_cocoa.h b/chrome/browser/ui/cocoa/browser_window_cocoa.h index 255b1cf..327f409 100644 --- a/chrome/browser/ui/cocoa/browser_window_cocoa.h +++ b/chrome/browser/ui/cocoa/browser_window_cocoa.h @@ -132,6 +132,8 @@ class BrowserWindowCocoa : public BrowserWindow, virtual void DestroyBrowser(); private: + int GetCommandId(const NativeWebKeyboardEvent& event); + bool HandleKeyboardEventInternal(NSEvent* event); NSWindow* window() const; // Accessor for the (current) |NSWindow|. void UpdateSidebarForContents(TabContents* tab_contents); |