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

views/controls/menu/menu_controller.cc

Index: views/controls/menu/menu_controller.cc
===================================================================
--- views/controls/menu/menu_controller.cc	(revision 71220)
+++ views/controls/menu/menu_controller.cc	(working copy)
@@ -4,13 +4,13 @@
 
 #include "views/controls/menu/menu_controller.h"
 
-#include "app/keyboard_codes.h"
 #include "app/l10n_util.h"
 #include "base/i18n/rtl.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "gfx/canvas_skia.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
+#include "ui/base/keycodes/keyboard_codes.h"
 #include "views/controls/button/menu_button.h"
 #include "views/controls/menu/menu_scroll_view_container.h"
 #include "views/controls/menu/submenu_view.h"
@@ -22,7 +22,7 @@
 #include "views/widget/widget.h"
 
 #if defined(OS_LINUX)
-#include "app/keyboard_code_conversion_gtk.h"
+#include "ui/base/keycodes/keyboard_code_conversion_gtk.h"
 #endif
 
 #if defined(TOUCH_UI)
@@ -830,7 +830,7 @@
 
   switch (event->type) {
     case GDK_KEY_PRESS: {
-      app::KeyboardCode win_keycode =
+      ui::KeyboardCode win_keycode =
           app::WindowsKeyCodeForGdkKeyCode(event->key.keyval);
 
       if (!OnKeyDown(win_keycode))
@@ -883,35 +883,35 @@
   DCHECK(blocking_run_);
 
   switch (key_code) {
-    case app::VKEY_UP:
+    case ui::VKEY_UP:
       IncrementSelection(-1);
       break;
 
-    case app::VKEY_DOWN:
+    case ui::VKEY_DOWN:
       IncrementSelection(1);
       break;
 
     // Handling of VK_RIGHT and VK_LEFT is different depending on the UI
     // layout.
-    case app::VKEY_RIGHT:
+    case ui::VKEY_RIGHT:
       if (base::i18n::IsRTL())
         CloseSubmenu();
       else
         OpenSubmenuChangeSelectionIfCan();
       break;
 
-    case app::VKEY_LEFT:
+    case ui::VKEY_LEFT:
       if (base::i18n::IsRTL())
         OpenSubmenuChangeSelectionIfCan();
       else
         CloseSubmenu();
       break;
 
-    case app::VKEY_SPACE:
+    case ui::VKEY_SPACE:
       SendAcceleratorToHotTrackedView();
       break;
 
-    case app::VKEY_RETURN:
+    case ui::VKEY_RETURN:
       if (pending_state_.item) {
         if (pending_state_.item->HasSubmenu()) {
           OpenSubmenuChangeSelectionIfCan();
@@ -923,7 +923,7 @@
       }
       break;
 
-    case app::VKEY_ESCAPE:
+    case ui::VKEY_ESCAPE:
       if (!state_.item->GetParentMenuItem() ||
           (!state_.item->GetParentMenuItem()->GetParentMenuItem() &&
            (!state_.item->HasSubmenu() ||
@@ -978,7 +978,7 @@
   if (!hot_view)
     return false;
 
-  Accelerator accelerator(app::VKEY_RETURN, false, false, false);
+  Accelerator accelerator(ui::VKEY_RETURN, false, false, false);
   hot_view->AcceleratorPressed(accelerator);
   hot_view->SetHotTracked(true);
   return true;