Commit 9ac55564 authored by Julie Jeongeun Kim's avatar Julie Jeongeun Kim Committed by Commit Bot

Convert UserId from user_id.mojom to new Mojo types

This CL converts UserId from user_id.mojom to new Mojo types
using ReceiverSet and PendingReceiver.

Bug: 955171
Change-Id: I15a7b25d0debc781387f8f3dbc9e9ce637fdb6b6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1849746Reviewed-by: default avatarKen Rockot <rockot@google.com>
Commit-Queue: Julie Kim <jkim@igalia.com>
Cr-Commit-Position: refs/heads/master@{#704894}
parent 18f03062
...@@ -10,7 +10,7 @@ namespace user_id { ...@@ -10,7 +10,7 @@ namespace user_id {
UserIdService::UserIdService(service_manager::mojom::ServiceRequest request) UserIdService::UserIdService(service_manager::mojom::ServiceRequest request)
: service_binding_(this, std::move(request)) { : service_binding_(this, std::move(request)) {
registry_.AddInterface<mojom::UserId>(base::BindRepeating( registry_.AddInterface<mojom::UserId>(base::BindRepeating(
&UserIdService::BindUserIdRequest, base::Unretained(this))); &UserIdService::BindUserIdReceiver, base::Unretained(this)));
} }
UserIdService::~UserIdService() = default; UserIdService::~UserIdService() = default;
...@@ -22,9 +22,9 @@ void UserIdService::OnBindInterface( ...@@ -22,9 +22,9 @@ void UserIdService::OnBindInterface(
registry_.BindInterface(interface_name, std::move(interface_pipe)); registry_.BindInterface(interface_name, std::move(interface_pipe));
} }
void UserIdService::BindUserIdRequest( void UserIdService::BindUserIdReceiver(
mojom::UserIdRequest request) { mojo::PendingReceiver<mojom::UserId> receiver) {
bindings_.AddBinding(this, std::move(request)); receivers_.Add(this, std::move(receiver));
} }
void UserIdService::GetInstanceGroup(GetInstanceGroupCallback callback) { void UserIdService::GetInstanceGroup(GetInstanceGroupCallback callback) {
......
...@@ -5,7 +5,8 @@ ...@@ -5,7 +5,8 @@
#ifndef SERVICES_USER_ID_USER_ID_SERVICE_H_ #ifndef SERVICES_USER_ID_USER_ID_SERVICE_H_
#define SERVICES_USER_ID_USER_ID_SERVICE_H_ #define SERVICES_USER_ID_USER_ID_SERVICE_H_
#include "mojo/public/cpp/bindings/binding_set.h" #include "mojo/public/cpp/bindings/pending_receiver.h"
#include "mojo/public/cpp/bindings/receiver_set.h"
#include "services/service_manager/public/cpp/binder_registry.h" #include "services/service_manager/public/cpp/binder_registry.h"
#include "services/service_manager/public/cpp/service.h" #include "services/service_manager/public/cpp/service.h"
#include "services/service_manager/public/cpp/service_binding.h" #include "services/service_manager/public/cpp/service_binding.h"
...@@ -28,11 +29,11 @@ class UserIdService : public service_manager::Service, public mojom::UserId { ...@@ -28,11 +29,11 @@ class UserIdService : public service_manager::Service, public mojom::UserId {
// mojom::UserId: // mojom::UserId:
void GetInstanceGroup(GetInstanceGroupCallback callback) override; void GetInstanceGroup(GetInstanceGroupCallback callback) override;
void BindUserIdRequest(mojom::UserIdRequest request); void BindUserIdReceiver(mojo::PendingReceiver<mojom::UserId> receiver);
service_manager::ServiceBinding service_binding_; service_manager::ServiceBinding service_binding_;
service_manager::BinderRegistry registry_; service_manager::BinderRegistry registry_;
mojo::BindingSet<mojom::UserId> bindings_; mojo::ReceiverSet<mojom::UserId> receivers_;
DISALLOW_COPY_AND_ASSIGN(UserIdService); DISALLOW_COPY_AND_ASSIGN(UserIdService);
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment