| Index: device/hid/input_service_linux.h
|
| diff --git a/device/hid/input_service_linux.h b/device/hid/input_service_linux.h
|
| index 55bf70c1c682a1231795bdce2173c7c28d7bc147..7eda3bb8126b0ba962b32b24f99e44985676cd43 100644
|
| --- a/device/hid/input_service_linux.h
|
| +++ b/device/hid/input_service_linux.h
|
| @@ -45,6 +45,9 @@ class InputServiceLinux : public base::MessageLoop::DestructionObserver {
|
| bool is_touchscreen : 1;
|
| };
|
|
|
| +
|
| + using DeviceMap = base::hash_map<std::string, InputDeviceInfo>;
|
| +
|
| class Observer {
|
| public:
|
| virtual ~Observer() {}
|
| @@ -53,6 +56,7 @@ class InputServiceLinux : public base::MessageLoop::DestructionObserver {
|
| };
|
|
|
| InputServiceLinux();
|
| + ~InputServiceLinux() override;
|
|
|
| static InputServiceLinux* GetInstance();
|
| static bool HasInstance();
|
| @@ -73,21 +77,18 @@ class InputServiceLinux : public base::MessageLoop::DestructionObserver {
|
| void WillDestroyCurrentMessageLoop() override;
|
|
|
| protected:
|
| - ~InputServiceLinux() override;
|
|
|
| void AddDevice(const InputDeviceInfo& info);
|
| void RemoveDevice(const std::string& id);
|
|
|
| bool CalledOnValidThread() const;
|
|
|
| - private:
|
| - friend struct base::DefaultDeleter<InputServiceLinux>;
|
| -
|
| - typedef base::hash_map<std::string, InputDeviceInfo> DeviceMap;
|
| -
|
| DeviceMap devices_;
|
| ObserverList<Observer> observers_;
|
|
|
| + private:
|
| + friend struct base::DefaultDeleter<InputServiceLinux>;
|
| +
|
| base::ThreadChecker thread_checker_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(InputServiceLinux);
|
|
|