diff options
| author | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-28 21:32:30 +0000 |
|---|---|---|
| committer | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-28 21:32:30 +0000 |
| commit | a4d271ecbea5ed763d49919fac7bfabe788832f6 (patch) | |
| tree | c646a4d085142007968138c7ad26d1fb2aafe6a9 /views/accelerator.h | |
| parent | 19ff283d0e043c59206fdc2e890a2780933849fe (diff) | |
| download | chromium_src-a4d271ecbea5ed763d49919fac7bfabe788832f6.zip chromium_src-a4d271ecbea5ed763d49919fac7bfabe788832f6.tar.gz chromium_src-a4d271ecbea5ed763d49919fac7bfabe788832f6.tar.bz2 | |
Reverting 27412 it breaks the toolkit views Linux build.
TBR=sky
Review URL: http://codereview.chromium.org/254005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27416 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/accelerator.h')
| -rw-r--r-- | views/accelerator.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/views/accelerator.h b/views/accelerator.h index 1848c98..bb8f91f 100644 --- a/views/accelerator.h +++ b/views/accelerator.h @@ -13,14 +13,13 @@ #include <string> -#include "base/keyboard_codes.h" #include "views/event.h" namespace views { class Accelerator { public: - Accelerator(base::KeyboardCode keycode, + Accelerator(int keycode, bool shift_pressed, bool ctrl_pressed, bool alt_pressed) : key_code_(keycode) { modifiers_ = 0; @@ -75,7 +74,7 @@ class Accelerator { return (modifiers_ & Event::EF_ALT_DOWN) == Event::EF_ALT_DOWN; } - base::KeyboardCode GetKeyCode() const { + int GetKeyCode() const { return key_code_; } @@ -84,7 +83,7 @@ class Accelerator { private: // The window keycode (VK_...). - base::KeyboardCode key_code_; + int key_code_; // The state of the Shift/Ctrl/Alt keys (see event.h). int modifiers_; |