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

Side by Side Diff: ui/events/x/hotplug_event_handler_x11.cc

Issue 685793002: Move all event related devices from ui/events/ to ui/events/devices/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@internal-touchscreens
Patch Set: Fixed ash include Created 6 years, 1 month 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
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/x/hotplug_event_handler_x11.h" 5 #include "ui/events/x/hotplug_event_handler_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 9
10 #include <algorithm> 10 #include <algorithm>
11 #include <cmath> 11 #include <cmath>
12 #include <set> 12 #include <set>
13 #include <string> 13 #include <string>
14 #include <vector> 14 #include <vector>
15 15
16 #include "base/command_line.h" 16 #include "base/command_line.h"
17 #include "base/logging.h" 17 #include "base/logging.h"
18 #include "base/process/launch.h" 18 #include "base/process/launch.h"
19 #include "base/strings/string_util.h" 19 #include "base/strings/string_util.h"
20 #include "base/sys_info.h" 20 #include "base/sys_info.h"
21 #include "ui/events/device_hotplug_event_observer.h" 21 #include "ui/events/devices/device_hotplug_event_observer.h"
22 #include "ui/events/device_util_linux.h" 22 #include "ui/events/devices/device_util_linux.h"
23 #include "ui/events/input_device.h" 23 #include "ui/events/devices/input_device.h"
24 #include "ui/events/keyboard_device.h" 24 #include "ui/events/devices/keyboard_device.h"
25 #include "ui/events/touchscreen_device.h" 25 #include "ui/events/devices/touchscreen_device.h"
26 #include "ui/gfx/x/x11_types.h" 26 #include "ui/gfx/x/x11_types.h"
27 27
28 namespace ui { 28 namespace ui {
29 29
30 namespace { 30 namespace {
31 31
32 // The name of the xinput device corresponding to the AT internal keyboard. 32 // The name of the xinput device corresponding to the AT internal keyboard.
33 const char kATKeyboardName[] = "AT Translated Set 2 keyboard"; 33 const char kATKeyboardName[] = "AT Translated Set 2 keyboard";
34 34
35 // The prefix of xinput devices corresponding to CrOS EC internal keyboards. 35 // The prefix of xinput devices corresponding to CrOS EC internal keyboards.
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
212 type, 212 type,
213 name, 213 name,
214 gfx::Size(max_x + 1, max_y + 1))); 214 gfx::Size(max_x + 1, max_y + 1)));
215 } 215 }
216 } 216 }
217 217
218 delegate_->OnTouchscreenDevicesUpdated(devices); 218 delegate_->OnTouchscreenDevicesUpdated(devices);
219 } 219 }
220 220
221 } // namespace ui 221 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698