summaryrefslogtreecommitdiffstats
path: root/views
diff options
context:
space:
mode:
authorfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-18 21:10:26 +0000
committerfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-18 21:10:26 +0000
commitcdf635ff5a04fe5cdc395b8d62aee7a846de5ef5 (patch)
tree9f1db7f590fbf4fe664a22e6239baa1223edff54 /views
parentd3794cf92b0b13181067e9cddaad436c01e009c9 (diff)
downloadchromium_src-cdf635ff5a04fe5cdc395b8d62aee7a846de5ef5.zip
chromium_src-cdf635ff5a04fe5cdc395b8d62aee7a846de5ef5.tar.gz
chromium_src-cdf635ff5a04fe5cdc395b8d62aee7a846de5ef5.tar.bz2
Home/End were being forwarded to the page from the find box.
BUG=22271 TEST=Open find-in-page on a page that contains a vertical scrollbar. Press Home and End and the page should not scroll. Review URL: http://codereview.chromium.org/209036 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26612 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
-rw-r--r--views/controls/textfield/textfield.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/views/controls/textfield/textfield.cc b/views/controls/textfield/textfield.cc
index 97240c7..05fb018 100644
--- a/views/controls/textfield/textfield.cc
+++ b/views/controls/textfield/textfield.cc
@@ -11,6 +11,7 @@
#include "app/gfx/insets.h"
#if defined(OS_WIN)
#include "app/win_util.h"
+#include "base/win_util.h"
#endif
#include "base/string_util.h"
@@ -289,11 +290,11 @@ base::KeyboardCode Textfield::Keystroke::GetKeyboardCode() const {
#if defined(OS_WIN)
bool Textfield::Keystroke::IsControlHeld() const {
- return GetKeyState(VK_CONTROL) >= 0;
+ return win_util::IsCtrlPressed();
}
bool Textfield::Keystroke::IsShiftHeld() const {
- return GetKeyState(VK_SHIFT) >= 0;
+ return win_util::IsShiftPressed();
}
#else
bool Textfield::Keystroke::IsControlHeld() const {