diff options
| author | merkulova <merkulova@chromium.org> | 2015-03-02 00:45:56 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-02 08:46:30 +0000 |
| commit | 4209a162a2a4a9b49c9096909fbfadb7a2608b72 (patch) | |
| tree | d1e160362b99dc8a80865d645573caa7354276ad /device/hid/input_service_linux.cc | |
| parent | c3a3f671f8e0c5777c6bc825f21d61c6bcafbec3 (diff) | |
| download | chromium_src-4209a162a2a4a9b49c9096909fbfadb7a2608b72.zip chromium_src-4209a162a2a4a9b49c9096909fbfadb7a2608b72.tar.gz chromium_src-4209a162a2a4a9b49c9096909fbfadb7a2608b72.tar.bz2 | |
Created fakes for HID-detection screen testing. Initial browsertest added.
BUG=456779
TBR=keybuk@chromium.org
Review URL: https://codereview.chromium.org/913773002
Cr-Commit-Position: refs/heads/master@{#318667}
Diffstat (limited to 'device/hid/input_service_linux.cc')
| -rw-r--r-- | device/hid/input_service_linux.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/device/hid/input_service_linux.cc b/device/hid/input_service_linux.cc index f6fd0dc..81cac1a 100644 --- a/device/hid/input_service_linux.cc +++ b/device/hid/input_service_linux.cc @@ -90,6 +90,9 @@ class InputServiceLinuxImpl : public InputServiceLinux, }; InputServiceLinuxImpl::InputServiceLinuxImpl() { + base::ThreadRestrictions::AssertIOAllowed(); + base::MessageLoop::current()->AddDestructionObserver(this); + DeviceMonitorLinux::GetInstance()->AddObserver(this); DeviceMonitorLinux::GetInstance()->Enumerate(base::Bind( &InputServiceLinuxImpl::OnDeviceAdded, base::Unretained(this))); @@ -98,6 +101,7 @@ InputServiceLinuxImpl::InputServiceLinuxImpl() { InputServiceLinuxImpl::~InputServiceLinuxImpl() { if (DeviceMonitorLinux::HasInstance()) DeviceMonitorLinux::GetInstance()->RemoveObserver(this); + base::MessageLoop::current()->RemoveDestructionObserver(this); } void InputServiceLinuxImpl::OnDeviceAdded(udev_device* device) { @@ -162,13 +166,10 @@ InputServiceLinux::InputDeviceInfo::InputDeviceInfo() is_touchscreen(false) {} InputServiceLinux::InputServiceLinux() { - base::ThreadRestrictions::AssertIOAllowed(); - base::MessageLoop::current()->AddDestructionObserver(this); } InputServiceLinux::~InputServiceLinux() { DCHECK(CalledOnValidThread()); - base::MessageLoop::current()->RemoveDestructionObserver(this); } // static |