| 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 #if defined(USE_X11) | 7 #if defined(USE_X11) |
| 8 #include <X11/Xlib.h> | 8 #include <X11/Xlib.h> |
| 9 #endif | 9 #endif |
| 10 | 10 |
| (...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 244 key->state &= ~kIgnoredModifiers; | 244 key->state &= ~kIgnoredModifiers; |
| 245 uint16 ch = ui::GetCharacterFromXEvent(native_event()); | 245 uint16 ch = ui::GetCharacterFromXEvent(native_event()); |
| 246 return ch ? ch : | 246 return ch ? ch : |
| 247 ui::GetCharacterFromKeyCode(key_code_, flags() & ui::EF_SHIFT_DOWN); | 247 ui::GetCharacterFromKeyCode(key_code_, flags() & ui::EF_SHIFT_DOWN); |
| 248 #else | 248 #else |
| 249 NOTIMPLEMENTED(); | 249 NOTIMPLEMENTED(); |
| 250 return 0; | 250 return 0; |
| 251 #endif | 251 #endif |
| 252 } | 252 } |
| 253 | 253 |
| 254 ScrollEvent::ScrollEvent(const base::NativeEvent& native_event) |
| 255 : MouseEvent(native_event) { |
| 256 ui::GetScrollOffsets(native_event, &x_offset_, &y_offset_); |
| 257 } |
| 258 |
| 254 } // namespace aura | 259 } // namespace aura |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 8907005:
Add support for new scroll valuators coming from CMT (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src