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/controls/link.cc | |
| 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/controls/link.cc')
| -rw-r--r-- | views/controls/link.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/views/controls/link.cc b/views/controls/link.cc index 6619568..f2887e0 100644 --- a/views/controls/link.cc +++ b/views/controls/link.cc @@ -10,7 +10,6 @@ #include "app/gfx/color_utils.h" #include "app/gfx/font.h" -#include "base/keyboard_codes.h" #include "base/logging.h" #include "views/event.h" @@ -124,8 +123,8 @@ void Link::OnMouseReleased(const MouseEvent& e, bool canceled) { bool Link::OnKeyPressed(const KeyEvent& e) { #if defined(OS_WIN) - bool activate = ((e.GetKeyCode() == base::VKEY_SPACE) || - (e.GetKeyCode() == base::VKEY_RETURN)); + bool activate = ((e.GetCharacter() == VK_SPACE) || + (e.GetCharacter() == VK_RETURN)); #else bool activate = false; NOTIMPLEMENTED(); @@ -147,8 +146,7 @@ bool Link::OnKeyPressed(const KeyEvent& e) { bool Link::SkipDefaultKeyEventProcessing(const KeyEvent& e) { #if defined(OS_WIN) // Make sure we don't process space or enter as accelerators. - return (e.GetKeyCode() == base::VKEY_SPACE) || - (e.GetKeyCode() == base::VKEY_RETURN); + return (e.GetCharacter() == VK_SPACE) || (e.GetCharacter() == VK_RETURN); #else NOTIMPLEMENTED(); return false; |