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

app/menus/accelerator_gtk.h

Index: app/menus/accelerator_gtk.h
===================================================================
--- app/menus/accelerator_gtk.h	(revision 58389)
+++ app/menus/accelerator_gtk.h	(working copy)
@@ -8,15 +8,15 @@
 
 #include <gdk/gdk.h>
 
-#include "app/keyboard_code_conversion_gtk.h"
-#include "app/keyboard_codes_posix.h"
 #include "app/menus/accelerator.h"
+#include "base/keyboard_code_conversion_gtk.h"
+#include "base/keyboard_codes_posix.h"
 
 namespace menus {
 
 class AcceleratorGtk : public Accelerator {
  public:
-  AcceleratorGtk(app::KeyboardCode key_code,
+  AcceleratorGtk(base::KeyboardCode key_code,
                  bool shift_pressed, bool ctrl_pressed, bool alt_pressed)
       : gdk_keyval_(0) {
     key_code_ = key_code;
@@ -30,7 +30,7 @@
   }
 
   AcceleratorGtk(guint keyval, GdkModifierType modifier_type) {
-    key_code_ = app::WindowsKeyCodeForGdkKeyCode(keyval);
+    key_code_ = base::WindowsKeyCodeForGdkKeyCode(keyval);
     gdk_keyval_ = keyval;
     modifiers_ = modifier_type;
   }
@@ -42,7 +42,7 @@
     return gdk_keyval_ > 0 ?
            // The second parameter is false because accelerator keys are
            // expressed in terms of the non-shift-modified key.
-           gdk_keyval_ : app::GdkKeyCodeForWindowsKeyCode(key_code_, false);
+           gdk_keyval_ : base::GdkKeyCodeForWindowsKeyCode(key_code_, false);
   }
 
   GdkModifierType gdk_modifier_type() {