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

Side by Side Diff: device/hid/input_service_linux.h

Issue 913773002: Created fakes for HID-detection screen testing. Initial browsertest added. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: TaskRunner used for InputServiceProxy. Created 5 years, 9 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 | « device/hid/hid.gyp ('k') | device/hid/input_service_linux.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 DEVICE_HID_INPUT_SERVICE_LINUX_H_ 5 #ifndef DEVICE_HID_INPUT_SERVICE_LINUX_H_
6 #define DEVICE_HID_INPUT_SERVICE_LINUX_H_ 6 #define DEVICE_HID_INPUT_SERVICE_LINUX_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 27 matching lines...) Expand all
38 bool is_accelerometer : 1; 38 bool is_accelerometer : 1;
39 bool is_joystick : 1; 39 bool is_joystick : 1;
40 bool is_key : 1; 40 bool is_key : 1;
41 bool is_keyboard : 1; 41 bool is_keyboard : 1;
42 bool is_mouse : 1; 42 bool is_mouse : 1;
43 bool is_tablet : 1; 43 bool is_tablet : 1;
44 bool is_touchpad : 1; 44 bool is_touchpad : 1;
45 bool is_touchscreen : 1; 45 bool is_touchscreen : 1;
46 }; 46 };
47 47
48
49 using DeviceMap = base::hash_map<std::string, InputDeviceInfo>;
50
48 class Observer { 51 class Observer {
49 public: 52 public:
50 virtual ~Observer() {} 53 virtual ~Observer() {}
51 virtual void OnInputDeviceAdded(const InputDeviceInfo& info) = 0; 54 virtual void OnInputDeviceAdded(const InputDeviceInfo& info) = 0;
52 virtual void OnInputDeviceRemoved(const std::string& id) = 0; 55 virtual void OnInputDeviceRemoved(const std::string& id) = 0;
53 }; 56 };
54 57
55 InputServiceLinux(); 58 InputServiceLinux();
59 ~InputServiceLinux() override;
56 60
57 static InputServiceLinux* GetInstance(); 61 static InputServiceLinux* GetInstance();
58 static bool HasInstance(); 62 static bool HasInstance();
59 static void SetForTesting(InputServiceLinux* service); 63 static void SetForTesting(InputServiceLinux* service);
60 64
61 void AddObserver(Observer* observer); 65 void AddObserver(Observer* observer);
62 void RemoveObserver(Observer* observer); 66 void RemoveObserver(Observer* observer);
63 67
64 // Returns list of all currently connected input/hid devices. 68 // Returns list of all currently connected input/hid devices.
65 void GetDevices(std::vector<InputDeviceInfo>* devices); 69 void GetDevices(std::vector<InputDeviceInfo>* devices);
66 70
67 // Returns an info about input device identified by |id|. When there're 71 // Returns an info about input device identified by |id|. When there're
68 // no input or hid device with such id, returns false and doesn't 72 // no input or hid device with such id, returns false and doesn't
69 // modify |info|. 73 // modify |info|.
70 bool GetDeviceInfo(const std::string& id, InputDeviceInfo* info) const; 74 bool GetDeviceInfo(const std::string& id, InputDeviceInfo* info) const;
71 75
72 // Implements base::MessageLoop::DestructionObserver 76 // Implements base::MessageLoop::DestructionObserver
73 void WillDestroyCurrentMessageLoop() override; 77 void WillDestroyCurrentMessageLoop() override;
74 78
75 protected: 79 protected:
76 ~InputServiceLinux() override;
77 80
78 void AddDevice(const InputDeviceInfo& info); 81 void AddDevice(const InputDeviceInfo& info);
79 void RemoveDevice(const std::string& id); 82 void RemoveDevice(const std::string& id);
80 83
81 bool CalledOnValidThread() const; 84 bool CalledOnValidThread() const;
82 85
86 DeviceMap devices_;
87 ObserverList<Observer> observers_;
88
83 private: 89 private:
84 friend struct base::DefaultDeleter<InputServiceLinux>; 90 friend struct base::DefaultDeleter<InputServiceLinux>;
85 91
86 typedef base::hash_map<std::string, InputDeviceInfo> DeviceMap;
87
88 DeviceMap devices_;
89 ObserverList<Observer> observers_;
90
91 base::ThreadChecker thread_checker_; 92 base::ThreadChecker thread_checker_;
92 93
93 DISALLOW_COPY_AND_ASSIGN(InputServiceLinux); 94 DISALLOW_COPY_AND_ASSIGN(InputServiceLinux);
94 }; 95 };
95 96
96 } // namespace device 97 } // namespace device
97 98
98 #endif // DEVICE_HID_INPUT_SERVICE_LINUX_H_ 99 #endif // DEVICE_HID_INPUT_SERVICE_LINUX_H_
OLDNEW
« no previous file with comments | « device/hid/hid.gyp ('k') | device/hid/input_service_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698