OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "services/ui/input_devices/input_device_server.h" | 5 #include "services/ui/input_devices/input_device_server.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "services/service_manager/public/cpp/bind_source_info.h" | 10 #include "services/service_manager/public/cpp/bind_source_info.h" |
11 #include "services/service_manager/public/cpp/binder_registry.h" | 11 #include "services/service_manager/public/cpp/binder_registry.h" |
12 #include "ui/events/devices/input_device.h" | 12 #include "ui/events/devices/input_device.h" |
13 #include "ui/events/devices/touchscreen_device.h" | 13 #include "ui/events/devices/touchscreen_device.h" |
14 | 14 |
15 #if defined(OS_CHROMEOS) | |
16 #include "services/ui/input_devices/touch_device_server.h" | |
17 #endif | |
18 | |
19 namespace ui { | 15 namespace ui { |
20 | 16 |
21 InputDeviceServer::InputDeviceServer() { | 17 InputDeviceServer::InputDeviceServer() {} |
22 #if defined(OS_CHROMEOS) | |
23 touch_device_server_ = base::MakeUnique<TouchDeviceServer>(); | |
24 #endif | |
25 } | |
26 | 18 |
27 InputDeviceServer::~InputDeviceServer() { | 19 InputDeviceServer::~InputDeviceServer() { |
28 if (manager_ && ui::DeviceDataManager::HasInstance()) { | 20 if (manager_ && ui::DeviceDataManager::HasInstance()) { |
29 manager_->RemoveObserver(this); | 21 manager_->RemoveObserver(this); |
30 manager_ = nullptr; | 22 manager_ = nullptr; |
31 } | 23 } |
32 } | 24 } |
33 | 25 |
34 void InputDeviceServer::RegisterAsObserver() { | 26 void InputDeviceServer::RegisterAsObserver() { |
35 if (!manager_ && ui::DeviceDataManager::HasInstance()) { | 27 if (!manager_ && ui::DeviceDataManager::HasInstance()) { |
36 manager_ = ui::DeviceDataManager::GetInstance(); | 28 manager_ = ui::DeviceDataManager::GetInstance(); |
37 manager_->AddObserver(this); | 29 manager_->AddObserver(this); |
38 } | 30 } |
39 } | 31 } |
40 | 32 |
41 bool InputDeviceServer::IsRegisteredAsObserver() const { | 33 bool InputDeviceServer::IsRegisteredAsObserver() const { |
42 return manager_ != nullptr; | 34 return manager_ != nullptr; |
43 } | 35 } |
44 | 36 |
45 void InputDeviceServer::AddInterface( | 37 void InputDeviceServer::AddInterface( |
46 service_manager::BinderRegistry* registry) { | 38 service_manager::BinderRegistry* registry) { |
47 DCHECK(IsRegisteredAsObserver()); | 39 DCHECK(IsRegisteredAsObserver()); |
48 registry->AddInterface<mojom::InputDeviceServer>( | 40 registry->AddInterface<mojom::InputDeviceServer>( |
49 base::Bind(&InputDeviceServer::BindInputDeviceServerRequest, | 41 base::Bind(&InputDeviceServer::BindInputDeviceServerRequest, |
50 base::Unretained(this))); | 42 base::Unretained(this))); |
51 #if defined(OS_CHROMEOS) | |
52 touch_device_server_->AddInterface(registry); | |
53 #endif | |
54 } | 43 } |
55 | 44 |
56 void InputDeviceServer::AddObserver( | 45 void InputDeviceServer::AddObserver( |
57 mojom::InputDeviceObserverMojoPtr observer) { | 46 mojom::InputDeviceObserverMojoPtr observer) { |
58 // We only want to send this message once, so we need to check to make sure | 47 // We only want to send this message once, so we need to check to make sure |
59 // device lists are actually complete before sending it to a new observer. | 48 // device lists are actually complete before sending it to a new observer. |
60 if (manager_->AreDeviceListsComplete()) | 49 if (manager_->AreDeviceListsComplete()) |
61 SendDeviceListsComplete(observer.get()); | 50 SendDeviceListsComplete(observer.get()); |
62 observers_.AddPtr(std::move(observer)); | 51 observers_.AddPtr(std::move(observer)); |
63 } | 52 } |
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
123 manager_->GetMouseDevices(), manager_->GetTouchpadDevices()); | 112 manager_->GetMouseDevices(), manager_->GetTouchpadDevices()); |
124 } | 113 } |
125 | 114 |
126 void InputDeviceServer::BindInputDeviceServerRequest( | 115 void InputDeviceServer::BindInputDeviceServerRequest( |
127 const service_manager::BindSourceInfo& source_info, | 116 const service_manager::BindSourceInfo& source_info, |
128 mojom::InputDeviceServerRequest request) { | 117 mojom::InputDeviceServerRequest request) { |
129 bindings_.AddBinding(this, std::move(request)); | 118 bindings_.AddBinding(this, std::move(request)); |
130 } | 119 } |
131 | 120 |
132 } // namespace ui | 121 } // namespace ui |
OLD | NEW |