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

views/focus/accelerator_handler_win.cc

 // Copyright (c) 2009 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/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"
 
 namespace views {
 
 AcceleratorHandler::AcceleratorHandler() {
 }
 
 bool AcceleratorHandler::Dispatch(const MSG& msg) {
   bool process_message = true;
 
   if (msg.message >= WM_KEYFIRST && msg.message <= WM_KEYLAST) {
     FocusManager* focus_manager =
         FocusManager::GetFocusManagerForNativeView(msg.hwnd);
     if (focus_manager) {
       switch (msg.message) {
         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);
           process_message = focus_manager->OnKeyEvent(event);
           if (!process_message) {
             // Record that this key is pressed so we can remember not to
             // translate and dispatch the associated WM_KEYUP.
             pressed_keys_.insert(msg.wParam);
           }
           break;
@@ skipping 15 matching lines @@
 
   if (process_message) {
     TranslateMessage(&msg);
     DispatchMessage(&msg);
   }
 
   return true;
 }
 
 }  // namespace views