Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(260)

Unified Diff: views/focus/accelerator_handler_win.cc

Issue 3337006: Revert 58388 - Revert 58215 - Revert 58186 - Move the keyboard files from bas... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « views/focus/accelerator_handler_gtk_unittest.cc ('k') | views/focus/focus_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/focus/accelerator_handler_win.cc
===================================================================
--- views/focus/accelerator_handler_win.cc (revision 58389)
+++ views/focus/accelerator_handler_win.cc (working copy)
@@ -4,8 +4,7 @@
#include "views/focus/accelerator_handler.h"
-#include "app/keyboard_code_conversion_win.h"
-#include "app/keyboard_codes.h"
+#include "base/keyboard_codes.h"
#include "base/win_util.h"
#include "views/event.h"
#include "views/focus/focus_manager.h"
@@ -26,7 +25,7 @@
case WM_KEYDOWN:
case WM_SYSKEYDOWN: {
KeyEvent event(Event::ET_KEY_PRESSED,
- app::KeyboardCodeForWindowsKeyCode(msg.wParam),
+ win_util::WinToKeyboardCode(msg.wParam),
KeyEvent::GetKeyStateFlags(),
msg.lParam & 0xFFFF,
(msg.lParam & 0xFFFF0000) >> 16);
« no previous file with comments | « views/focus/accelerator_handler_gtk_unittest.cc ('k') | views/focus/focus_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698