summaryrefslogtreecommitdiffstats
path: root/chrome/browser/tab_contents
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-04 21:04:04 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-04 21:04:04 +0000
commit3ebf9af0cd55de5d312f0df5254580ab60ac0c64 (patch)
tree9d332e0833925545f0cdce851e349a9b109626b6 /chrome/browser/tab_contents
parent076bf0b69eafa42accb20e5ccfe23805ed91655d (diff)
downloadchromium_src-3ebf9af0cd55de5d312f0df5254580ab60ac0c64.zip
chromium_src-3ebf9af0cd55de5d312f0df5254580ab60ac0c64.tar.gz
chromium_src-3ebf9af0cd55de5d312f0df5254580ab60ac0c64.tar.bz2
Fixing WebKeyboardEvent.
Review URL: http://codereview.chromium.org/39075 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10918 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tab_contents')
-rw-r--r--chrome/browser/tab_contents/web_contents_view_win.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/tab_contents/web_contents_view_win.cc b/chrome/browser/tab_contents/web_contents_view_win.cc
index bdbf89c..c66d339 100644
--- a/chrome/browser/tab_contents/web_contents_view_win.cc
+++ b/chrome/browser/tab_contents/web_contents_view_win.cc
@@ -249,7 +249,7 @@ void WebContentsViewWin::TakeFocus(bool reverse) {
void WebContentsViewWin::HandleKeyboardEvent(const WebKeyboardEvent& event) {
// Previous calls to TranslateMessage can generate CHAR events as well as
- // KEY_DOWN events, even if the latter triggered an accelerator. In these
+ // RAW_KEY_DOWN events, even if the latter triggered an accelerator. In these
// cases, we discard the CHAR events.
if (event.type == WebInputEvent::CHAR && ignore_next_char_event_) {
ignore_next_char_event_ = false;
@@ -259,13 +259,13 @@ void WebContentsViewWin::HandleKeyboardEvent(const WebKeyboardEvent& event) {
// The renderer returned a keyboard event it did not process. This may be
// a keyboard shortcut that we have to process.
- if (event.type == WebInputEvent::KEY_DOWN) {
+ if (event.type == WebInputEvent::RAW_KEY_DOWN) {
views::FocusManager* focus_manager =
views::FocusManager::GetFocusManager(GetHWND());
// We may not have a focus_manager at this point (if the tab has been
// switched by the time this message returned).
if (focus_manager) {
- views::Accelerator accelerator(event.key_code,
+ views::Accelerator accelerator(event.windows_key_code,
(event.modifiers & WebInputEvent::SHIFT_KEY) ==
WebInputEvent::SHIFT_KEY,
(event.modifiers & WebInputEvent::CTRL_KEY) ==