Re-lands 58186:

views/focus/accelerator_handler_win.cc

Index: views/focus/accelerator_handler_win.cc
diff --git a/views/focus/accelerator_handler_win.cc b/views/focus/accelerator_handler_win.cc
index 64b51f497fbe670716d2e4904bf009ac865912cd..496acd4f3310f59f707c108e3ac4dbbca2d0c058 100644
--- a/views/focus/accelerator_handler_win.cc
+++ b/views/focus/accelerator_handler_win.cc
@@ -4,7 +4,8 @@
 
 #include "views/focus/accelerator_handler.h"
 
-#include "base/keyboard_codes.h"
+#include "app/keyboard_code_conversion_win.h"
+#include "app/keyboard_codes.h"
 #include "base/win_util.h"
 #include "views/event.h"
 #include "views/focus/focus_manager.h"
@@ -25,7 +26,7 @@ bool AcceleratorHandler::Dispatch(const MSG& msg) {
         case WM_KEYDOWN:
         case WM_SYSKEYDOWN: {
           KeyEvent event(Event::ET_KEY_PRESSED,
-                         win_util::WinToKeyboardCode(msg.wParam),
+                         app::KeyboardCodeForWindowsKeyCode(msg.wParam),
                          KeyEvent::GetKeyStateFlags(),
                          msg.lParam & 0xFFFF,
                          (msg.lParam & 0xFFFF0000) >> 16);