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

Unified Diff: views/events/event_aura.cc

Issue 7942004: Consolidate/cleanup event cracking code; single out GdkEvents. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Windows event code consolidation. Created 9 years, 3 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
Index: views/events/event_aura.cc
diff --git a/views/events/event_aura.cc b/views/events/event_aura.cc
index 57c9d973e21756bcbd33fc1231b3a43394605bdb..0938ef358fd16863f92f4fa052fe743cee02275d 100644
--- a/views/events/event_aura.cc
+++ b/views/events/event_aura.cc
@@ -11,21 +11,14 @@ namespace views {
namespace {
-int GetKeyStateFlags() {
- NOTIMPLEMENTED();
- return 0;
-}
-
-ui::EventType EventTypeFromNative(NativeEvent native_event) {
+ui::EventType EventTypeFromNative(const views::NativeEvent& native_event) {
return native_event->type();
}
-int EventFlagsFromNative(NativeEvent native_event) {
+int EventFlagsFromNative(const views::NativeEvent& native_event) {
return native_event->flags();
}
-}
-
bool IsClientMouseEvent(const views::NativeEvent& native_event) {
return true;
}
@@ -34,6 +27,8 @@ bool IsNonClientMouseEvent(const views::NativeEvent& native_event) {
return false;
}
+} // namespace
+
////////////////////////////////////////////////////////////////////////////////
// Event, private:
@@ -74,7 +69,7 @@ LocatedEvent::LocatedEvent(NativeEvent2 native_event_2,
// KeyEvent, public:
KeyEvent::KeyEvent(NativeEvent native_event)
- : Event(native_event, native_event->type(), GetKeyStateFlags()),
+ : Event(native_event, native_event->type(), native_event->flags()),
key_code_(static_cast<aura::KeyEvent*>(native_event)->key_code()),
character_(0),
unmodified_character_(0) {
« ui/base/win/event_util.h ('K') | « views/events/event.h ('k') | views/events/event_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698