summaryrefslogtreecommitdiffstats
path: root/views/event.h
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-01 19:09:06 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-01 19:09:06 +0000
commit92258389a1a4190987f3b4a64386fd9eb0f126ea (patch)
tree567ea0779660a7f822289f3c945721f2e9d6fad1 /views/event.h
parent47fa280c2ff011bb948a9978687418079731a854 (diff)
downloadchromium_src-92258389a1a4190987f3b4a64386fd9eb0f126ea.zip
chromium_src-92258389a1a4190987f3b4a64386fd9eb0f126ea.tar.gz
chromium_src-92258389a1a4190987f3b4a64386fd9eb0f126ea.tar.bz2
Revert 58186 - 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=bryeung@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58215 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/event.h')
-rw-r--r--views/event.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/views/event.h b/views/event.h
index 14a6af7..aa1905c 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,
- app::KeyboardCode key_code,
+ base::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 app/keyboard_codes.h which is
+ // This returns a VKEY_ value as defined in base/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.
- app::KeyboardCode GetKeyCode() const {
+ base::KeyboardCode GetKeyCode() const {
return key_code_;
}
@@ -340,7 +340,7 @@ class KeyEvent : public Event {
private:
- app::KeyboardCode key_code_;
+ base::KeyboardCode key_code_;
int repeat_count_;
int message_flags_;