Index: views/widget/widget_win.cc |
=================================================================== |
--- views/widget/widget_win.cc (revision 74437) |
+++ views/widget/widget_win.cc (working copy) |
@@ -19,6 +19,7 @@ |
#include "ui/gfx/path.h" |
#include "views/accessibility/view_accessibility.h" |
#include "views/controls/native_control_win.h" |
+#include "views/focus/accelerator_handler.h" |
#include "views/focus/focus_util_win.h" |
#include "views/views_delegate.h" |
#include "views/widget/aero_tooltip_manager.h" |
@@ -689,9 +690,7 @@ |
} |
void WidgetWin::OnKeyDown(TCHAR c, UINT rep_cnt, UINT flags) { |
- KeyEvent event(ui::ET_KEY_PRESSED, ui::KeyboardCodeForWindowsKeyCode(c), |
- KeyEvent::GetKeyStateFlags(), rep_cnt, flags, |
- WM_KEYDOWN); |
+ KeyEvent event(AcceleratorHandler::current_message()); |
RootView* root_view = GetFocusedViewRootView(); |
if (!root_view) |
root_view = root_view_.get(); |
@@ -700,9 +699,7 @@ |
} |
void WidgetWin::OnKeyUp(TCHAR c, UINT rep_cnt, UINT flags) { |
- KeyEvent event(ui::ET_KEY_RELEASED, ui::KeyboardCodeForWindowsKeyCode(c), |
- KeyEvent::GetKeyStateFlags(), rep_cnt, flags, |
- WM_KEYUP); |
+ KeyEvent event(AcceleratorHandler::current_message()); |
RootView* root_view = GetFocusedViewRootView(); |
if (!root_view) |
root_view = root_view_.get(); |