diff options
author | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-31 22:53:37 +0000 |
---|---|---|
committer | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-31 22:53:37 +0000 |
commit | 148d105e27c7c8c2cda0c81292690b9edafcae1f (patch) | |
tree | e278052fc84a6e5399aec5bd0d423162aecb6d16 /views/focus/focus_manager.h | |
parent | dc75d4823b598a9b9b313728a06f6b47d6a73929 (diff) | |
download | chromium_src-148d105e27c7c8c2cda0c81292690b9edafcae1f.zip chromium_src-148d105e27c7c8c2cda0c81292690b9edafcae1f.tar.gz chromium_src-148d105e27c7c8c2cda0c81292690b9edafcae1f.tar.bz2 |
This CL adds accelerators to the Linux toolkit views.
The MessageLoop had to be modified to support Dispatchers on Linux.
BUG=None
TEST=On Windows and Linux, make sure the accelerators still work as expected. On Linux toolkit views, build and run the unit-tests.
Review URL: http://codereview.chromium.org/159046
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22210 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/focus/focus_manager.h')
-rw-r--r-- | views/focus/focus_manager.h | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/views/focus/focus_manager.h b/views/focus/focus_manager.h index b1c87b6..3106f72 100644 --- a/views/focus/focus_manager.h +++ b/views/focus/focus_manager.h @@ -5,9 +5,6 @@ #ifndef VIEWS_FOCUS_FOCUS_MANAGER_H_ #define VIEWS_FOCUS_FOCUS_MANAGER_H_ -#if defined(OS_WIN) -#include <windows.h> -#endif #include <vector> #include <map> #include <list> @@ -140,13 +137,10 @@ class FocusManager { explicit FocusManager(Widget* widget); ~FocusManager(); -#if defined(OS_WIN) - // OnKeyDown covers WM_KEYDOWN and WM_SYSKEYDOWN. - bool OnKeyDown(HWND window, - UINT message, - WPARAM wparam, - LPARAM lparam); -#endif + // Processes the passed key event for accelerators and tab traversal. + // Returns false if the event has been consumed and should not be processed + // further. + bool OnKeyEvent(const KeyEvent& event); // Returns true is the specified is part of the hierarchy of the window // associated with this FocusManager. |