Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(309)

Unified Diff: views/event.h

Issue 6246001: Move app/key* to ui/base/keycodes/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « views/controls/tree/tree_view.cc ('k') | views/event.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/event.h
===================================================================
--- views/event.h (revision 71220)
+++ views/event.h (working copy)
@@ -6,9 +6,9 @@
#define VIEWS_EVENT_H_
#pragma once
-#include "app/keyboard_codes.h"
#include "base/basictypes.h"
#include "gfx/point.h"
+#include "ui/base/keycodes/keyboard_codes.h"
#if defined(OS_LINUX)
typedef struct _GdkEventKey GdkEventKey;
@@ -331,14 +331,14 @@
public:
// Create a new key event
KeyEvent(EventType type,
- app::KeyboardCode key_code,
+ ui::KeyboardCode key_code,
int event_flags,
int repeat_count,
int message_flags);
#if defined(OS_WIN)
KeyEvent(EventType type,
- app::KeyboardCode key_code,
+ ui::KeyboardCode key_code,
int event_flags,
int repeat_count,
int message_flags,
@@ -358,7 +358,7 @@
// 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 {
+ ui::KeyboardCode GetKeyCode() const {
return key_code_;
}
@@ -380,7 +380,7 @@
private:
- app::KeyboardCode key_code_;
+ ui::KeyboardCode key_code_;
int repeat_count_;
int message_flags_;
#if defined(OS_WIN)
« no previous file with comments | « views/controls/tree/tree_view.cc ('k') | views/event.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698