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

views/controls/menu/menu_controller.cc

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