OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/events/x/device_data_manager_x11.h" | 5 #include "ui/events/devices/device_data_manager_x11.h" |
6 | 6 |
7 #include <X11/extensions/XInput.h> | 7 #include <X11/extensions/XInput.h> |
8 #include <X11/extensions/XInput2.h> | 8 #include <X11/extensions/XInput2.h> |
9 #include <X11/Xlib.h> | 9 #include <X11/Xlib.h> |
10 | 10 |
11 #include <utility> | 11 #include <utility> |
12 | 12 |
13 #include "base/logging.h" | 13 #include "base/logging.h" |
14 #include "base/memory/singleton.h" | 14 #include "base/memory/singleton.h" |
15 #include "base/sys_info.h" | 15 #include "base/sys_info.h" |
| 16 #include "ui/events/devices/keyboard_device.h" |
16 #include "ui/events/event_constants.h" | 17 #include "ui/events/event_constants.h" |
17 #include "ui/events/event_switches.h" | 18 #include "ui/events/event_switches.h" |
18 #include "ui/events/keyboard_device.h" | |
19 #include "ui/events/keycodes/keyboard_code_conversion_x.h" | 19 #include "ui/events/keycodes/keyboard_code_conversion_x.h" |
20 #include "ui/events/x/device_list_cache_x.h" | 20 #include "ui/events/x/device_list_cache_x.h" |
21 #include "ui/events/x/touch_factory_x11.h" | 21 #include "ui/events/x/touch_factory_x11.h" |
22 #include "ui/gfx/display.h" | 22 #include "ui/gfx/display.h" |
23 #include "ui/gfx/point3_f.h" | 23 #include "ui/gfx/point3_f.h" |
24 #include "ui/gfx/x/x11_types.h" | 24 #include "ui/gfx/x/x11_types.h" |
25 | 25 |
26 // XIScrollClass was introduced in XI 2.1 so we need to define it here | 26 // XIScrollClass was introduced in XI 2.1 so we need to define it here |
27 // for backward-compatibility with older versions of XInput. | 27 // for backward-compatibility with older versions of XInput. |
28 #if !defined(XIScrollClass) | 28 #if !defined(XIScrollClass) |
(...skipping 731 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
760 } else { | 760 } else { |
761 keyboards.erase(it); | 761 keyboards.erase(it); |
762 ++blocked_iter; | 762 ++blocked_iter; |
763 } | 763 } |
764 } | 764 } |
765 // Notify base class of updated list. | 765 // Notify base class of updated list. |
766 DeviceDataManager::OnKeyboardDevicesUpdated(keyboards); | 766 DeviceDataManager::OnKeyboardDevicesUpdated(keyboards); |
767 } | 767 } |
768 | 768 |
769 } // namespace ui | 769 } // namespace ui |
OLD | NEW |