diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-11 17:08:40 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-11 17:08:40 +0000 |
| commit | af8026f5fe4fb9d5e4018f79d3ee5f2dec9edf32 (patch) | |
| tree | da7f9d85c06aeb2a9f70d32aa48317a5b30fb23e | |
| parent | e245206cc330eda42aa9e22b2968343c4b2a1d3d (diff) | |
| download | chromium_src-af8026f5fe4fb9d5e4018f79d3ee5f2dec9edf32.zip chromium_src-af8026f5fe4fb9d5e4018f79d3ee5f2dec9edf32.tar.gz chromium_src-af8026f5fe4fb9d5e4018f79d3ee5f2dec9edf32.tar.bz2 | |
touch: Fix build after NativeEvent2 change.
TBR=ben@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74619 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | views/events/event_x.cc | 7 | ||||
| -rw-r--r-- | views/focus/accelerator_handler_touch.cc | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/views/events/event_x.cc b/views/events/event_x.cc index a03fad6..96639d3 100644 --- a/views/events/event_x.cc +++ b/views/events/event_x.cc @@ -228,7 +228,8 @@ int GetMouseEventFlags(XEvent* xev) { //////////////////////////////////////////////////////////////////////////////// // Event, private: -void Event::InitWithNativeEvent2(NativeEvent2 native_event_2) { +void Event::InitWithNativeEvent2(NativeEvent2 native_event_2, + FromNativeEvent2) { native_event_ = NULL; // TODO(beng): remove once we rid views of Gtk/Gdk. native_event_2_ = native_event_2; @@ -237,11 +238,11 @@ void Event::InitWithNativeEvent2(NativeEvent2 native_event_2) { //////////////////////////////////////////////////////////////////////////////// // KeyEvent, public: -KeyEvent::KeyEvent(NativeEvent2 native_event_2, FromNativeEvent2) +KeyEvent::KeyEvent(NativeEvent2 native_event_2, FromNativeEvent2 from_native_2) : Event(native_event_2, EventTypeFromNative(native_event_2), GetEventFlagsFromXState(native_event_2->xkey.state), - FromNativeEvent2), + from_native_2), key_code_(ui::KeyboardCodeFromXKeyEvent(native_event_2)) { } diff --git a/views/focus/accelerator_handler_touch.cc b/views/focus/accelerator_handler_touch.cc index c00edfc..c6f8e1e 100644 --- a/views/focus/accelerator_handler_touch.cc +++ b/views/focus/accelerator_handler_touch.cc @@ -164,7 +164,8 @@ bool DispatchXEvent(XEvent* xev) { switch (xev->type) { case KeyPress: case KeyRelease: { - KeyEvent keyev(xev, FromNativeEvent2); + Event::FromNativeEvent2 from_native_2; + KeyEvent keyev(xev, from_native_2); return root->ProcessKeyEvent(keyev); } |