Re-lands 58186:

views/controls/native_control.cc

Index: views/controls/native_control.cc
diff --git a/views/controls/native_control.cc b/views/controls/native_control.cc
index 942a0930fe5fe6baeb6f92cdbf1237ce81c38d2e..a0ff1b09c7cdcba041fc9f96948f2a89c5670934 100644
--- a/views/controls/native_control.cc
+++ b/views/controls/native_control.cc
@@ -10,8 +10,9 @@
 #include <atlframe.h>
 #include <atlmisc.h>
 
+#include "app/keyboard_code_conversion_win.h"
+#include "app/keyboard_codes.h"
 #include "app/l10n_util_win.h"
-#include "base/keyboard_codes.h"
 #include "base/logging.h"
 #include "base/win_util.h"
 #include "gfx/native_theme_win.h"
@@ -359,7 +360,7 @@ LRESULT CALLBACK NativeControl::NativeControlWndProc(HWND window, UINT message,
   DCHECK(native_control);
 
   if (message == WM_KEYDOWN &&
-      native_control->OnKeyDown(win_util::WinToKeyboardCode(w_param))) {
+      native_control->OnKeyDown(app::KeyboardCodeForWindowsKeyCode(w_param))) {
     return 0;
   } else if (message == WM_SETFOCUS) {
     // Let the focus manager know that the focus changed.