| 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 "ui/aura/event.h" | 5 #include "ui/aura/event.h" |
| 6 | 6 |
| 7 #include "ui/aura/window.h" | 7 #include "ui/aura/window.h" |
| 8 | 8 |
| 9 namespace aura { | 9 namespace aura { |
| 10 | 10 |
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 108 const gfx::Point& location, | 108 const gfx::Point& location, |
| 109 int touch_id) | 109 int touch_id) |
| 110 : LocatedEvent(type, location, 0), | 110 : LocatedEvent(type, location, 0), |
| 111 touch_id_(touch_id), | 111 touch_id_(touch_id), |
| 112 radius_x_(1.0f), | 112 radius_x_(1.0f), |
| 113 radius_y_(1.0f), | 113 radius_y_(1.0f), |
| 114 rotation_angle_(0.0f), | 114 rotation_angle_(0.0f), |
| 115 force_(0.0f) { | 115 force_(0.0f) { |
| 116 } | 116 } |
| 117 | 117 |
| 118 KeyEvent::KeyEvent(const base::NativeEvent& native_event) | 118 KeyEvent::KeyEvent(const base::NativeEvent& native_event, bool is_char) |
| 119 : Event(native_event, | 119 : Event(native_event, |
| 120 ui::EventTypeFromNative(native_event), | 120 ui::EventTypeFromNative(native_event), |
| 121 ui::EventFlagsFromNative(native_event)), | 121 ui::EventFlagsFromNative(native_event)), |
| 122 key_code_(ui::KeyboardCodeFromNative(native_event)) { | 122 key_code_(ui::KeyboardCodeFromNative(native_event)), |
| 123 is_char_(is_char) { |
| 123 } | 124 } |
| 124 | 125 |
| 125 KeyEvent::KeyEvent(ui::EventType type, | 126 KeyEvent::KeyEvent(ui::EventType type, |
| 126 ui::KeyboardCode key_code, | 127 ui::KeyboardCode key_code, |
| 127 int flags) | 128 int flags) |
| 128 : Event(type, flags), | 129 : Event(type, flags), |
| 129 key_code_(key_code) { | 130 key_code_(key_code), |
| 131 is_char_(false) { |
| 130 } | 132 } |
| 131 | 133 |
| 132 } // namespace aura | 134 } // namespace aura |
| OLD | NEW |