From 4d9ad321aacef3f11121f02220957dec69004ecd Mon Sep 17 00:00:00 2001 From: Henrique Ferreiro Date: Wed, 23 Oct 2019 20:27:42 +0000 Subject: [PATCH] Migrate gesture_properties_service.mojom to the new Mojo types Convert the implementation and all users of the ui::ozone::mojom::GesturePropertiesService interface. Bug: 955171 Change-Id: I8a70b91624fef3f7e94e25e2f7071d85a4dec42a Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1864776 Reviewed-by: Robert Kroeger Reviewed-by: Michael Spang Reviewed-by: Oksana Zhuravlova Reviewed-by: Ryo Hashimoto Commit-Queue: Henrique Ferreiro Cr-Commit-Position: refs/heads/master@{#708759} --- ash/dbus/gesture_properties_service_provider.cc | 4 +--- ash/dbus/gesture_properties_service_provider.h | 3 ++- ui/events/ozone/DEPS | 2 +- ui/events/ozone/chromeos/gesture_properties_service.cc | 6 ++++-- ui/events/ozone/chromeos/gesture_properties_service.h | 8 +++++--- ui/events/ozone/evdev/input_controller_evdev.cc | 5 +++-- ui/events/ozone/evdev/input_controller_evdev.h | 4 +++- ui/events/ozone/evdev/input_device_factory_evdev.cc | 4 ++-- ui/events/ozone/evdev/input_device_factory_evdev.h | 3 ++- .../ozone/evdev/input_device_factory_evdev_proxy.cc | 6 ++++-- ui/events/ozone/evdev/input_device_factory_evdev_proxy.h | 9 +++++---- ui/ozone/public/input_controller.cc | 3 ++- ui/ozone/public/input_controller.h | 4 +++- 13 files changed, 37 insertions(+), 24 deletions(-) diff --git a/ash/dbus/gesture_properties_service_provider.cc b/ash/dbus/gesture_properties_service_provider.cc index d3ff0765b835fb..ceb1955eacca50 100644 --- a/ash/dbus/gesture_properties_service_provider.cc +++ b/ash/dbus/gesture_properties_service_provider.cc @@ -359,11 +359,9 @@ GesturePropertiesServiceProvider::GetService() { return service_for_test_; if (!service_.is_bound()) { - ui::ozone::mojom::GesturePropertiesServiceRequest request = - mojo::MakeRequest(&service_); ui::OzonePlatform::GetInstance() ->GetInputController() - ->GetGesturePropertiesService(std::move(request)); + ->GetGesturePropertiesService(service_.BindNewPipeAndPassReceiver()); } return service_.get(); } diff --git a/ash/dbus/gesture_properties_service_provider.h b/ash/dbus/gesture_properties_service_provider.h index addcbd6e8e263d..54bf7cfbdf2294 100644 --- a/ash/dbus/gesture_properties_service_provider.h +++ b/ash/dbus/gesture_properties_service_provider.h @@ -13,6 +13,7 @@ #include "chromeos/dbus/services/cros_dbus_service.h" #include "dbus/exported_object.h" #include "dbus/message.h" +#include "mojo/public/cpp/bindings/remote.h" #include "ui/ozone/public/mojom/gesture_properties_service.mojom.h" namespace dbus { @@ -65,7 +66,7 @@ class ASH_EXPORT GesturePropertiesServiceProvider ui::ozone::mojom::GesturePropertiesService* GetService(); - ui::ozone::mojom::GesturePropertiesServicePtr service_; + mojo::Remote service_; ui::ozone::mojom::GesturePropertiesService* service_for_test_ = nullptr; base::WeakPtrFactory weak_ptr_factory_; diff --git a/ui/events/ozone/DEPS b/ui/events/ozone/DEPS index 7841c627dc1a82..c4c2788a8f07ab 100644 --- a/ui/events/ozone/DEPS +++ b/ui/events/ozone/DEPS @@ -1,5 +1,5 @@ include_rules = [ "+device/udev_linux", - "+mojo/public/cpp/bindings/binding.h", + "+mojo/public/cpp/bindings", "+ui/ozone/public", ] diff --git a/ui/events/ozone/chromeos/gesture_properties_service.cc b/ui/events/ozone/chromeos/gesture_properties_service.cc index 384a4895722237..3345af4079943f 100644 --- a/ui/events/ozone/chromeos/gesture_properties_service.cc +++ b/ui/events/ozone/chromeos/gesture_properties_service.cc @@ -4,6 +4,8 @@ #include "ui/events/ozone/chromeos/gesture_properties_service.h" +#include + namespace ui { namespace { @@ -66,8 +68,8 @@ bool TrySetPropertyValues(GesturesProp* property, GesturePropertiesService::GesturePropertiesService( GesturePropertyProvider* provider, - ozone::mojom::GesturePropertiesServiceRequest request) - : prop_provider_(provider), binding_(this, std::move(request)) {} + mojo::PendingReceiver receiver) + : prop_provider_(provider), receiver_(this, std::move(receiver)) {} void GesturePropertiesService::ListDevices(ListDevicesCallback reply) { base::flat_map response = {}; diff --git a/ui/events/ozone/chromeos/gesture_properties_service.h b/ui/events/ozone/chromeos/gesture_properties_service.h index c9e8144bf73cc8..08c2f55db90d2c 100644 --- a/ui/events/ozone/chromeos/gesture_properties_service.h +++ b/ui/events/ozone/chromeos/gesture_properties_service.h @@ -5,7 +5,8 @@ #ifndef UI_EVENTS_OZONE_CHROMEOS_GESTURE_PROPERTIES_SERVICE_H_ #define UI_EVENTS_OZONE_CHROMEOS_GESTURE_PROPERTIES_SERVICE_H_ -#include "mojo/public/cpp/bindings/binding.h" +#include "mojo/public/cpp/bindings/pending_receiver.h" +#include "mojo/public/cpp/bindings/receiver.h" #include "ui/events/ozone/evdev/events_ozone_evdev_export.h" #include "ui/events/ozone/evdev/libgestures_glue/gesture_property_provider.h" #include "ui/ozone/public/mojom/gesture_properties_service.mojom.h" @@ -19,7 +20,8 @@ class EVENTS_OZONE_EVDEV_EXPORT GesturePropertiesService public: GesturePropertiesService( GesturePropertyProvider* provider, - ui::ozone::mojom::GesturePropertiesServiceRequest request); + mojo::PendingReceiver + receiver); void ListDevices(ListDevicesCallback callback) override; void ListProperties(int32_t device_id, @@ -34,7 +36,7 @@ class EVENTS_OZONE_EVDEV_EXPORT GesturePropertiesService private: GesturePropertyProvider* prop_provider_; - mojo::Binding binding_; + mojo::Receiver receiver_; }; } // namespace ui diff --git a/ui/events/ozone/evdev/input_controller_evdev.cc b/ui/events/ozone/evdev/input_controller_evdev.cc index a7ef8810440d2b..f68e16c778b485 100644 --- a/ui/events/ozone/evdev/input_controller_evdev.cc +++ b/ui/events/ozone/evdev/input_controller_evdev.cc @@ -7,6 +7,7 @@ #include #include +#include #include "base/bind.h" #include "base/callback.h" @@ -189,9 +190,9 @@ void InputControllerEvdev::GetTouchEventLog(const base::FilePath& out_dir, } void InputControllerEvdev::GetGesturePropertiesService( - ozone::mojom::GesturePropertiesServiceRequest request) { + mojo::PendingReceiver receiver) { if (input_device_factory_) - input_device_factory_->GetGesturePropertiesService(std::move(request)); + input_device_factory_->GetGesturePropertiesService(std::move(receiver)); } void InputControllerEvdev::ScheduleUpdateDeviceSettings() { diff --git a/ui/events/ozone/evdev/input_controller_evdev.h b/ui/events/ozone/evdev/input_controller_evdev.h index e57becfa869374..fbd8664e07ae82 100644 --- a/ui/events/ozone/evdev/input_controller_evdev.h +++ b/ui/events/ozone/evdev/input_controller_evdev.h @@ -9,6 +9,7 @@ #include "base/macros.h" #include "base/memory/weak_ptr.h" +#include "mojo/public/cpp/bindings/pending_receiver.h" #include "ui/events/ozone/evdev/events_ozone_evdev_export.h" #include "ui/events/ozone/evdev/input_device_settings_evdev.h" #include "ui/ozone/public/input_controller.h" @@ -70,7 +71,8 @@ class EVENTS_OZONE_EVDEV_EXPORT InputControllerEvdev : public InputController { void SetInternalKeyboardFilter(bool enable_filter, std::vector allowed_keys) override; void GetGesturePropertiesService( - ozone::mojom::GesturePropertiesServiceRequest request) override; + mojo::PendingReceiver receiver) + override; private: // Post task to update settings. diff --git a/ui/events/ozone/evdev/input_device_factory_evdev.cc b/ui/events/ozone/evdev/input_device_factory_evdev.cc index fb7fd06c2823e1..0638c51f278718 100644 --- a/ui/events/ozone/evdev/input_device_factory_evdev.cc +++ b/ui/events/ozone/evdev/input_device_factory_evdev.cc @@ -299,10 +299,10 @@ void InputDeviceFactoryEvdev::GetTouchEventLog( } void InputDeviceFactoryEvdev::GetGesturePropertiesService( - ozone::mojom::GesturePropertiesServiceRequest request) { + mojo::PendingReceiver receiver) { #if defined(USE_EVDEV_GESTURES) gesture_properties_service_ = std::make_unique( - gesture_property_provider_.get(), std::move(request)); + gesture_property_provider_.get(), std::move(receiver)); #endif } diff --git a/ui/events/ozone/evdev/input_device_factory_evdev.h b/ui/events/ozone/evdev/input_device_factory_evdev.h index 2d09d079e9a971..51c52e3aa6bfd0 100644 --- a/ui/events/ozone/evdev/input_device_factory_evdev.h +++ b/ui/events/ozone/evdev/input_device_factory_evdev.h @@ -17,6 +17,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/task_runner.h" +#include "mojo/public/cpp/bindings/pending_receiver.h" #include "ui/events/ozone/evdev/event_converter_evdev.h" #include "ui/events/ozone/evdev/event_device_info.h" #include "ui/events/ozone/evdev/events_ozone_evdev_export.h" @@ -68,7 +69,7 @@ class EVENTS_OZONE_EVDEV_EXPORT InputDeviceFactoryEvdev { InputController::GetTouchEventLogReply reply); void GetGesturePropertiesService( - ozone::mojom::GesturePropertiesServiceRequest request); + mojo::PendingReceiver receiver); base::WeakPtr GetWeakPtr(); diff --git a/ui/events/ozone/evdev/input_device_factory_evdev_proxy.cc b/ui/events/ozone/evdev/input_device_factory_evdev_proxy.cc index 02822e2d67ea9c..46dcccbd3e1701 100644 --- a/ui/events/ozone/evdev/input_device_factory_evdev_proxy.cc +++ b/ui/events/ozone/evdev/input_device_factory_evdev_proxy.cc @@ -4,6 +4,8 @@ #include "ui/events/ozone/evdev/input_device_factory_evdev_proxy.h" +#include + #include "base/bind.h" #include "base/callback.h" #include "base/threading/thread_task_runner_handle.h" @@ -99,11 +101,11 @@ void InputDeviceFactoryEvdevProxy::GetTouchEventLog( } void InputDeviceFactoryEvdevProxy::GetGesturePropertiesService( - ozone::mojom::GesturePropertiesServiceRequest request) { + mojo::PendingReceiver receiver) { task_runner_->PostTask( FROM_HERE, base::BindOnce(&InputDeviceFactoryEvdev::GetGesturePropertiesService, - input_device_factory_, std::move(request))); + input_device_factory_, std::move(receiver))); } } // namespace ui diff --git a/ui/events/ozone/evdev/input_device_factory_evdev_proxy.h b/ui/events/ozone/evdev/input_device_factory_evdev_proxy.h index 30739e140c45a5..30ef8a095f70c3 100644 --- a/ui/events/ozone/evdev/input_device_factory_evdev_proxy.h +++ b/ui/events/ozone/evdev/input_device_factory_evdev_proxy.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef UI_EVENTS_OZONE_EVDEV_INPUT_DEVICE_FACTORY_PROXY_EVDEV_H_ -#define UI_EVENTS_OZONE_EVDEV_INPUT_DEVICE_FACTORY_PROXY_EVDEV_H_ +#ifndef UI_EVENTS_OZONE_EVDEV_INPUT_DEVICE_FACTORY_EVDEV_PROXY_H_ +#define UI_EVENTS_OZONE_EVDEV_INPUT_DEVICE_FACTORY_EVDEV_PROXY_H_ #include #include @@ -15,6 +15,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/single_thread_task_runner.h" +#include "mojo/public/cpp/bindings/pending_receiver.h" #include "ui/events/ozone/evdev/events_ozone_evdev_export.h" #include "ui/ozone/public/input_controller.h" @@ -47,7 +48,7 @@ class EVENTS_OZONE_EVDEV_EXPORT InputDeviceFactoryEvdevProxy { void GetTouchEventLog(const base::FilePath& out_dir, InputController::GetTouchEventLogReply reply); void GetGesturePropertiesService( - ozone::mojom::GesturePropertiesServiceRequest request); + mojo::PendingReceiver receiver); private: scoped_refptr task_runner_; @@ -58,4 +59,4 @@ class EVENTS_OZONE_EVDEV_EXPORT InputDeviceFactoryEvdevProxy { } // namespace ui -#endif // UI_EVENTS_OZONE_EVDEV_INPUT_DEVICE_FACTORY_PROXY_EVDEV_H_ +#endif // UI_EVENTS_OZONE_EVDEV_INPUT_DEVICE_FACTORY_EVDEV_PROXY_H_ diff --git a/ui/ozone/public/input_controller.cc b/ui/ozone/public/input_controller.cc index 318958881323ab..9ea7cb30a1d18f 100644 --- a/ui/ozone/public/input_controller.cc +++ b/ui/ozone/public/input_controller.cc @@ -59,7 +59,8 @@ class StubInputController : public InputController { void SetInternalKeyboardFilter(bool enable_filter, std::vector allowed_keys) override {} void GetGesturePropertiesService( - ui::ozone::mojom::GesturePropertiesServiceRequest request) override {} + mojo::PendingReceiver + receiver) override {} private: DISALLOW_COPY_AND_ASSIGN(StubInputController); diff --git a/ui/ozone/public/input_controller.h b/ui/ozone/public/input_controller.h index 6584525af2bb91..d001a4373a1024 100644 --- a/ui/ozone/public/input_controller.h +++ b/ui/ozone/public/input_controller.h @@ -14,6 +14,7 @@ #include "base/component_export.h" #include "base/files/file_path.h" #include "base/macros.h" +#include "mojo/public/cpp/bindings/pending_receiver.h" #include "ui/ozone/public/mojom/gesture_properties_service.mojom.h" namespace base { @@ -92,7 +93,8 @@ class COMPONENT_EXPORT(OZONE_BASE) InputController { std::vector allowed_keys) = 0; virtual void GetGesturePropertiesService( - ui::ozone::mojom::GesturePropertiesServiceRequest request) = 0; + mojo::PendingReceiver + receiver) = 0; private: DISALLOW_COPY_AND_ASSIGN(InputController);