summaryrefslogtreecommitdiffstats
path: root/views/accelerator.h
diff options
context:
space:
mode:
authorjcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-29 00:33:35 +0000
committerjcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-29 00:33:35 +0000
commitbc1407f95bae3d7472ee0c85ef83ee10610b3f1f (patch)
treeeeb1e01423fefc13afe5738d809df200b5e50623 /views/accelerator.h
parent62525634a6f5727216828f8e05a4f563be90dfeb (diff)
downloadchromium_src-bc1407f95bae3d7472ee0c85ef83ee10610b3f1f.zip
chromium_src-bc1407f95bae3d7472ee0c85ef83ee10610b3f1f.tar.gz
chromium_src-bc1407f95bae3d7472ee0c85ef83ee10610b3f1f.tar.bz2
Relanding keyboard code refactoring:
http://codereview.chromium.org/248010/show Changing the KeyboardEvent to use a KeyboardCode instead of a w_char. Led to several places where I had to switch from VK_ to VKEY_. Also cleaned-up the table view OnKeyDown method. Since TableView is a NativeControl it can use the NativeControl::OnKeyDown directly. BUG=None TEST=Make sure short-cuts works as expected, especially in the omnibox. Review URL: http://codereview.chromium.org/251020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27444 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/accelerator.h')
-rw-r--r--views/accelerator.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/views/accelerator.h b/views/accelerator.h
index bb8f91f..1848c98 100644
--- a/views/accelerator.h
+++ b/views/accelerator.h
@@ -13,13 +13,14 @@
#include <string>
+#include "base/keyboard_codes.h"
#include "views/event.h"
namespace views {
class Accelerator {
public:
- Accelerator(int keycode,
+ Accelerator(base::KeyboardCode keycode,
bool shift_pressed, bool ctrl_pressed, bool alt_pressed)
: key_code_(keycode) {
modifiers_ = 0;
@@ -74,7 +75,7 @@ class Accelerator {
return (modifiers_ & Event::EF_ALT_DOWN) == Event::EF_ALT_DOWN;
}
- int GetKeyCode() const {
+ base::KeyboardCode GetKeyCode() const {
return key_code_;
}
@@ -83,7 +84,7 @@ class Accelerator {
private:
// The window keycode (VK_...).
- int key_code_;
+ base::KeyboardCode key_code_;
// The state of the Shift/Ctrl/Alt keys (see event.h).
int modifiers_;