Re-lands 58186:

views/window/window_win.cc

Index: views/window/window_win.cc
diff --git a/views/window/window_win.cc b/views/window/window_win.cc
index af0346350973dec63eba72a18d0b32b5911d3da1..6aa522411f84dd3e9bcce0708cb892b95747b1e2 100644
--- a/views/window/window_win.cc
+++ b/views/window/window_win.cc
@@ -7,6 +7,7 @@
 #include <dwmapi.h>
 #include <shellapi.h>
 
+#include "app/keyboard_code_conversion_win.h"
 #include "app/theme_provider.h"
 #include "app/win_util.h"
 #include "base/i18n/rtl.h"
@@ -1120,7 +1121,7 @@ void WindowWin::OnSysCommand(UINT notification_code, CPoint click) {
   // Handle SC_KEYMENU, which means that the user has pressed the ALT
   // key and released it, so we should focus the menu bar.
   if ((notification_code & sc_mask) == SC_KEYMENU && click.x == 0) {
-    Accelerator accelerator(win_util::WinToKeyboardCode(VK_MENU),
+    Accelerator accelerator(app::KeyboardCodeForWindowsKeyCode(VK_MENU),
                             false, false, false);
     GetFocusManager()->ProcessAccelerator(accelerator);
     return;