| 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 "mojo/public/cpp/bindings/array.h" | 10 #include "mojo/public/cpp/bindings/array.h" |
| 11 #include "services/shell/public/cpp/interface_registry.h" |
| 11 #include "ui/events/devices/input_device.h" | 12 #include "ui/events/devices/input_device.h" |
| 12 #include "ui/events/devices/touchscreen_device.h" | 13 #include "ui/events/devices/touchscreen_device.h" |
| 13 | 14 |
| 14 namespace ui { | 15 namespace ui { |
| 15 | 16 |
| 16 InputDeviceServer::InputDeviceServer() {} | 17 InputDeviceServer::InputDeviceServer() {} |
| 17 | 18 |
| 18 InputDeviceServer::~InputDeviceServer() { | 19 InputDeviceServer::~InputDeviceServer() { |
| 19 if (manager_ && ui::DeviceDataManager::HasInstance()) { | 20 if (manager_ && ui::DeviceDataManager::HasInstance()) { |
| 20 manager_->RemoveObserver(this); | 21 manager_->RemoveObserver(this); |
| 21 manager_ = nullptr; | 22 manager_ = nullptr; |
| 22 } | 23 } |
| 23 } | 24 } |
| 24 | 25 |
| 25 void InputDeviceServer::RegisterAsObserver() { | 26 void InputDeviceServer::RegisterAsObserver() { |
| 26 if (!manager_ && ui::DeviceDataManager::HasInstance()) { | 27 if (!manager_ && ui::DeviceDataManager::HasInstance()) { |
| 27 manager_ = ui::DeviceDataManager::GetInstance(); | 28 manager_ = ui::DeviceDataManager::GetInstance(); |
| 28 manager_->AddObserver(this); | 29 manager_->AddObserver(this); |
| 29 } | 30 } |
| 30 } | 31 } |
| 31 | 32 |
| 32 bool InputDeviceServer::IsRegisteredAsObserver() const { | 33 bool InputDeviceServer::IsRegisteredAsObserver() const { |
| 33 return manager_ != nullptr; | 34 return manager_ != nullptr; |
| 34 } | 35 } |
| 35 | 36 |
| 36 void InputDeviceServer::AddInterface(shell::Connection* connection) { | 37 void InputDeviceServer::AddInterface(shell::InterfaceRegistry* registry) { |
| 37 DCHECK(IsRegisteredAsObserver()); | 38 DCHECK(IsRegisteredAsObserver()); |
| 38 connection->AddInterface<mojom::InputDeviceServer>(this); | 39 registry->AddInterface<mojom::InputDeviceServer>(this); |
| 39 } | 40 } |
| 40 | 41 |
| 41 void InputDeviceServer::AddObserver( | 42 void InputDeviceServer::AddObserver( |
| 42 mojom::InputDeviceObserverMojoPtr observer) { | 43 mojom::InputDeviceObserverMojoPtr observer) { |
| 43 // We only want to send this message once, so we need to check to make sure | 44 // We only want to send this message once, so we need to check to make sure |
| 44 // device lists are actually complete before sending it to a new observer. | 45 // device lists are actually complete before sending it to a new observer. |
| 45 if (manager_->AreDeviceListsComplete()) | 46 if (manager_->AreDeviceListsComplete()) |
| 46 SendDeviceListsComplete(observer.get()); | 47 SendDeviceListsComplete(observer.get()); |
| 47 observers_.AddPtr(std::move(observer)); | 48 observers_.AddPtr(std::move(observer)); |
| 48 } | 49 } |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 101 manager_->GetKeyboardDevices(), manager_->GetTouchscreenDevices(), | 102 manager_->GetKeyboardDevices(), manager_->GetTouchscreenDevices(), |
| 102 manager_->GetMouseDevices(), manager_->GetTouchpadDevices()); | 103 manager_->GetMouseDevices(), manager_->GetTouchpadDevices()); |
| 103 } | 104 } |
| 104 | 105 |
| 105 void InputDeviceServer::Create(const shell::Identity& remote_identity, | 106 void InputDeviceServer::Create(const shell::Identity& remote_identity, |
| 106 mojom::InputDeviceServerRequest request) { | 107 mojom::InputDeviceServerRequest request) { |
| 107 bindings_.AddBinding(this, std::move(request)); | 108 bindings_.AddBinding(this, std::move(request)); |
| 108 } | 109 } |
| 109 | 110 |
| 110 } // namespace ui | 111 } // namespace ui |
| OLD | NEW |