Re-lands 58186:

Original message:
"""
Move the keyboard files from base/ to app/.

Also moves the associated classes/enums from base:: to app::.

TEST=try bots compile
BUG=NONE

Review URL: http://codereview.chromium.org/3165064
"""

TBR=phajdan.jr@chromium.org

Review URL: http://codereview.chromium.org/3354005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58438 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 5 deletions

diff --git a/views/event.h b/views/event.h
index aa1905c..14a6af7 100644
--- a/views/event.h
+++ b/views/event.h
@@ -6,8 +6,8 @@
 #define VIEWS_EVENT_H_
 #pragma once
 
+#include "app/keyboard_codes.h"
 #include "base/basictypes.h"
-#include "base/keyboard_codes.h"
 #include "gfx/point.h"
 
 #if defined(OS_LINUX)
@@ -309,7 +309,7 @@ class KeyEvent : public Event {
  public:
   // Create a new key event
   KeyEvent(EventType type,
-           base::KeyboardCode key_code,
+           app::KeyboardCode key_code,
            int event_flags,
            int repeat_count,
            int message_flags);
@@ -317,11 +317,11 @@ class KeyEvent : public Event {
   explicit KeyEvent(GdkEventKey* event);
 #endif
 
-  // This returns a VKEY_ value as defined in base/keyboard_codes.h which is
+  // This returns a VKEY_ value as defined in app/keyboard_codes.h which is
   // the Windows value.
   // On GTK, you can use the methods in keyboard_code_conversion_gtk.cc to
   // convert this value back to a GDK value if needed.
-  base::KeyboardCode GetKeyCode() const {
+  app::KeyboardCode GetKeyCode() const {
     return key_code_;
   }
 
@@ -340,7 +340,7 @@ class KeyEvent : public Event {
 
  private:
 
-  base::KeyboardCode key_code_;
+  app::KeyboardCode key_code_;
   int repeat_count_;
   int message_flags_;