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

Side by Side Diff: ui/events/devices/input_device.h

Issue 904733002: Remove useless InputDevice::name field (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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 | « ash/virtual_keyboard_controller_unittest.cc ('k') | ui/events/devices/input_device.cc » ('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 #ifndef UI_EVENTS_DEVICES_INPUT_DEVICE_H_ 5 #ifndef UI_EVENTS_DEVICES_INPUT_DEVICE_H_
6 #define UI_EVENTS_DEVICES_INPUT_DEVICE_H_ 6 #define UI_EVENTS_DEVICES_INPUT_DEVICE_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "ui/events/devices/events_devices_export.h" 10 #include "ui/events/devices/events_devices_export.h"
11 11
12 namespace ui { 12 namespace ui {
13 13
14 enum InputDeviceType { 14 enum InputDeviceType {
15 INPUT_DEVICE_INTERNAL, // Internally connected input device. 15 INPUT_DEVICE_INTERNAL, // Internally connected input device.
16 INPUT_DEVICE_EXTERNAL, // Known externally connected input device. 16 INPUT_DEVICE_EXTERNAL, // Known externally connected input device.
17 INPUT_DEVICE_UNKNOWN, // Device that may or may not be an external device. 17 INPUT_DEVICE_UNKNOWN, // Device that may or may not be an external device.
18 }; 18 };
19 19
20 // Represents an input device state. 20 // Represents an input device state.
21 struct EVENTS_DEVICES_EXPORT InputDevice { 21 struct EVENTS_DEVICES_EXPORT InputDevice {
22 static const unsigned int kInvalidId; 22 static const unsigned int kInvalidId;
23 23
24 // Creates an invalid input device. 24 // Creates an invalid input device.
25 InputDevice(); 25 InputDevice();
26 26
27 InputDevice(unsigned int id, InputDeviceType type, const std::string& name); 27 InputDevice(unsigned int id, InputDeviceType type);
28 virtual ~InputDevice(); 28 virtual ~InputDevice();
29 29
30 // ID of the device. This ID is unique between all input devices. 30 // ID of the device. This ID is unique between all input devices.
31 unsigned int id; 31 unsigned int id;
32 32
33 // The type of the input device. 33 // The type of the input device.
34 InputDeviceType type; 34 InputDeviceType type;
35
36 // Name of the device.
37 std::string name;
38 }; 35 };
39 36
40 } // namespace ui 37 } // namespace ui
41 38
42 #endif // UI_EVENTS_DEVICES_INPUT_DEVICE_H_ 39 #endif // UI_EVENTS_DEVICES_INPUT_DEVICE_H_
OLDNEW
« no previous file with comments | « ash/virtual_keyboard_controller_unittest.cc ('k') | ui/events/devices/input_device.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698