| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "views/events/event.h" | 5 #include "views/events/event.h" |
| 6 | 6 |
| 7 #include <gdk/gdk.h> | 7 #include <gdk/gdk.h> |
| 8 | 8 |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "ui/base/keycodes/keyboard_code_conversion_gtk.h" | 10 #include "ui/base/keycodes/keyboard_code_conversion_gtk.h" |
| (...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 161 NOTREACHED(); | 161 NOTREACHED(); |
| 162 } | 162 } |
| 163 #endif | 163 #endif |
| 164 | 164 |
| 165 //////////////////////////////////////////////////////////////////////////////// | 165 //////////////////////////////////////////////////////////////////////////////// |
| 166 // KeyEvent, public: | 166 // KeyEvent, public: |
| 167 | 167 |
| 168 KeyEvent::KeyEvent(NativeEvent native_event) | 168 KeyEvent::KeyEvent(NativeEvent native_event) |
| 169 : Event(native_event, EventTypeFromNative(native_event), | 169 : Event(native_event, EventTypeFromNative(native_event), |
| 170 GetFlagsFromGdkState(GetGdkStateFromNative(native_event))), | 170 GetFlagsFromGdkState(GetGdkStateFromNative(native_event))), |
| 171 key_code_(ui::WindowsKeyCodeForGdkKeyCode( | 171 key_code_(ui::KeyboardCodeFromGdkEventKey( |
| 172 GetGdkEventKeyFromNative(native_event)->keyval)) { | 172 GetGdkEventKeyFromNative(native_event))) { |
| 173 } | 173 } |
| 174 | 174 |
| 175 #if !defined(TOUCH_UI) | 175 #if !defined(TOUCH_UI) |
| 176 KeyEvent::KeyEvent(NativeEvent2 native_event_2, FromNativeEvent2 from_native) | 176 KeyEvent::KeyEvent(NativeEvent2 native_event_2, FromNativeEvent2 from_native) |
| 177 : Event(native_event_2, ui::ET_UNKNOWN, 0, from_native) { | 177 : Event(native_event_2, ui::ET_UNKNOWN, 0, from_native) { |
| 178 // No one should ever call this on Gtk-views. | 178 // No one should ever call this on Gtk-views. |
| 179 // TODO(beng): remove once we rid views of Gtk/Gdk. | 179 // TODO(beng): remove once we rid views of Gtk/Gdk. |
| 180 NOTREACHED(); | 180 NOTREACHED(); |
| 181 } | 181 } |
| 182 #endif | 182 #endif |
| (...skipping 10 matching lines...) Expand all Loading... |
| 193 MouseWheelEvent::MouseWheelEvent(NativeEvent2 native_event_2, | 193 MouseWheelEvent::MouseWheelEvent(NativeEvent2 native_event_2, |
| 194 FromNativeEvent2 from_native) | 194 FromNativeEvent2 from_native) |
| 195 : MouseEvent(native_event_2, from_native) { | 195 : MouseEvent(native_event_2, from_native) { |
| 196 // No one should ever call this on Gtk-views. | 196 // No one should ever call this on Gtk-views. |
| 197 // TODO(msw): remove once we rid views of Gtk/Gdk. | 197 // TODO(msw): remove once we rid views of Gtk/Gdk. |
| 198 NOTREACHED(); | 198 NOTREACHED(); |
| 199 } | 199 } |
| 200 #endif | 200 #endif |
| 201 | 201 |
| 202 } // namespace views | 202 } // namespace views |
| OLD | NEW |