Move app/key* to ui/base/keycodes/*

views/controls/native_control.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/controls/native_control.h"
 
 #include <atlbase.h>
 #include <atlapp.h>
 #include <atlcrack.h>
 #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 "app/win/hwnd_util.h"
 #include "app/view_prop.h"
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
 #include "gfx/native_theme_win.h"
+#include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/base/keycodes/keyboard_code_conversion_win.h"
 #include "views/background.h"
 #include "views/border.h"
 #include "views/controls/native/native_view_host.h"
 #include "views/focus/focus_manager.h"
 #include "views/widget/widget.h"
 
 using app::ViewProp;
 
 namespace views {
 
@@ skipping 333 matching lines @@
                                                      UINT message,
                                                      WPARAM w_param,
                                                      LPARAM l_param) {
   NativeControl* native_control = static_cast<NativeControl*>(
       ViewProp::GetValue(window, kNativeControlKey));
   DCHECK(native_control);
   WNDPROC original_handler = native_control->container_->original_handler_;
   DCHECK(original_handler);
 
   if (message == WM_KEYDOWN &&
-      native_control->OnKeyDown(app::KeyboardCodeForWindowsKeyCode(w_param))) {
+      native_control->OnKeyDown(ui::KeyboardCodeForWindowsKeyCode(w_param))) {
     return 0;
   } else if (message == WM_SETFOCUS) {
     // Let the focus manager know that the focus changed.
     FocusManager* focus_manager = native_control->GetFocusManager();
     if (focus_manager) {
       focus_manager->SetFocusedView(native_control);
     } else {
       NOTREACHED();
     }
   } else if (message == WM_DESTROY) {
     app::win::SetWindowProc(window,
                             reinterpret_cast<WNDPROC>(original_handler));
     native_control->container_->prop_.reset();
   }
 
   return CallWindowProc(reinterpret_cast<WNDPROC>(original_handler), window,
                         message, w_param, l_param);
 }
 
 }  // namespace views