Revert 58388 - Revert 58215 - Revert 58186 - Move the keyboard files from bas...

views/window/window_win.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "views/window/window_win.h"
 
 #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"
 #include "base/win_util.h"
 #include "gfx/canvas_skia_paint.h"
 #include "gfx/font.h"
 #include "gfx/icon_util.h"
 #include "gfx/path.h"
 #include "views/accessibility/view_accessibility.h"
 #include "views/widget/root_view.h"
@@ skipping 1093 matching lines @@
         // we've begun to move the window, we need to unlock updates so that the
         // sizing/moving feedback can be continuous.
         UnlockUpdates();
       }
     }
   }
 
   // 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(app::KeyboardCodeForWindowsKeyCode(VK_MENU),
+    Accelerator accelerator(win_util::WinToKeyboardCode(VK_MENU),
                             false, false, false);
     GetFocusManager()->ProcessAccelerator(accelerator);
     return;
   }
 
   // First see if the delegate can handle it.
   if (window_delegate_->ExecuteWindowsCommand(notification_code))
     return;
 
   // Use the default implementation for any other command.
@@ skipping 380 matching lines @@
   Window::CloseSecondaryWidget(root_view->GetWidget());
   return TRUE;
 }
 }  // namespace
 
 void Window::CloseAllSecondaryWindows() {
   EnumThreadWindows(GetCurrentThreadId(), WindowCallbackProc, 0);
 }
 
 }  // namespace views