Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(15)

Side by Side Diff: ui/events/devices/x11/device_data_manager_x11.cc

Issue 823703003: Cleanup: Update the path to insets and point headers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: point.h Created 5 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ui/events/cocoa/events_mac_unittest.mm ('k') | ui/events/event.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/devices/x11/device_data_manager_x11.h" 5 #include "ui/events/devices/x11/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/devices/keyboard_device.h"
17 #include "ui/events/devices/x11/device_list_cache_x11.h" 17 #include "ui/events/devices/x11/device_list_cache_x11.h"
18 #include "ui/events/devices/x11/touch_factory_x11.h" 18 #include "ui/events/devices/x11/touch_factory_x11.h"
19 #include "ui/events/event_constants.h" 19 #include "ui/events/event_constants.h"
20 #include "ui/events/event_switches.h" 20 #include "ui/events/event_switches.h"
21 #include "ui/events/keycodes/keyboard_code_conversion_x.h" 21 #include "ui/events/keycodes/keyboard_code_conversion_x.h"
22 #include "ui/gfx/display.h" 22 #include "ui/gfx/display.h"
23 #include "ui/gfx/point3_f.h" 23 #include "ui/gfx/geometry/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)
29 #define XIScrollClass 3 29 #define XIScrollClass 3
30 #endif 30 #endif
31 31
32 // Multi-touch support was introduced in XI 2.2. Add XI event types here 32 // Multi-touch support was introduced in XI 2.2. Add XI event types here
33 // for backward-compatibility with older versions of XInput. 33 // for backward-compatibility with older versions of XInput.
(...skipping 715 matching lines...) Expand 10 before | Expand all | Expand 10 after
749 } else { 749 } else {
750 keyboards.erase(it); 750 keyboards.erase(it);
751 ++blocked_iter; 751 ++blocked_iter;
752 } 752 }
753 } 753 }
754 // Notify base class of updated list. 754 // Notify base class of updated list.
755 DeviceDataManager::OnKeyboardDevicesUpdated(keyboards); 755 DeviceDataManager::OnKeyboardDevicesUpdated(keyboards);
756 } 756 }
757 757
758 } // namespace ui 758 } // namespace ui
OLDNEW
« no previous file with comments | « ui/events/cocoa/events_mac_unittest.mm ('k') | ui/events/event.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698