Commit 2f4e5917 authored by Julie Jeongeun Kim's avatar Julie Jeongeun Kim Committed by Commit Bot

Convert arc::mojom::{PrinterDiscoverySessionHost, PrintJobHost} to new Mojo types

This CL partially converts arc::mojom::PrinterDiscoverySessionHost and
arc::mojom::PrintJobHost to new Mojo types using PendingReceiver and
Receiver. It still keeps CreateDiscoverySessionCallback and
PrintCallback with InterfacePtr from
//components/arc/mojom/print.mojom with since arc mojom files are
shared with other repo and it doesn't have new Mojo types yet.

Bug: 955171
Change-Id: I7e41271540b5bbdd14d2d5de76accac0891f9223
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1955895Reviewed-by: default avatarHidehiko Abe <hidehiko@chromium.org>
Reviewed-by: default avatarKen Rockot <rockot@google.com>
Commit-Queue: Julie Kim <jkim@igalia.com>
Cr-Commit-Position: refs/heads/master@{#724080}
parent f7678dc5
...@@ -39,7 +39,8 @@ ...@@ -39,7 +39,8 @@
#include "content/public/browser/notification_details.h" #include "content/public/browser/notification_details.h"
#include "content/public/browser/notification_source.h" #include "content/public/browser/notification_source.h"
#include "content/public/common/child_process_host.h" #include "content/public/common/child_process_host.h"
#include "mojo/public/cpp/bindings/strong_binding.h" #include "mojo/public/cpp/bindings/pending_receiver.h"
#include "mojo/public/cpp/bindings/receiver.h"
#include "mojo/public/cpp/platform/platform_handle.h" #include "mojo/public/cpp/platform/platform_handle.h"
#include "mojo/public/cpp/system/platform_handle.h" #include "mojo/public/cpp/system/platform_handle.h"
#include "printing/backend/print_backend.h" #include "printing/backend/print_backend.h"
...@@ -208,11 +209,11 @@ class PrinterDiscoverySessionHostImpl ...@@ -208,11 +209,11 @@ class PrinterDiscoverySessionHostImpl
public chromeos::CupsPrintersManager::Observer { public chromeos::CupsPrintersManager::Observer {
public: public:
PrinterDiscoverySessionHostImpl( PrinterDiscoverySessionHostImpl(
mojo::InterfaceRequest<mojom::PrinterDiscoverySessionHost> request, mojo::PendingReceiver<mojom::PrinterDiscoverySessionHost> receiver,
mojom::PrinterDiscoverySessionInstancePtr instance, mojom::PrinterDiscoverySessionInstancePtr instance,
ArcPrintServiceImpl* service, ArcPrintServiceImpl* service,
Profile* profile) Profile* profile)
: binding_(this, std::move(request)), : receiver_(this, std::move(receiver)),
instance_(std::move(instance)), instance_(std::move(instance)),
service_(service), service_(service),
printers_manager_( printers_manager_(
...@@ -220,7 +221,7 @@ class PrinterDiscoverySessionHostImpl ...@@ -220,7 +221,7 @@ class PrinterDiscoverySessionHostImpl
profile)), profile)),
configurer_(chromeos::PrinterConfigurer::Create(profile)) { configurer_(chromeos::PrinterConfigurer::Create(profile)) {
printers_manager_->AddObserver(this); printers_manager_->AddObserver(this);
binding_.set_connection_error_handler(MakeErrorHandler()); receiver_.set_disconnect_handler(MakeErrorHandler());
instance_.set_connection_error_handler(MakeErrorHandler()); instance_.set_connection_error_handler(MakeErrorHandler());
} }
...@@ -334,7 +335,7 @@ class PrinterDiscoverySessionHostImpl ...@@ -334,7 +335,7 @@ class PrinterDiscoverySessionHostImpl
} }
// Binds |this|. // Binds |this|.
mojo::Binding<mojom::PrinterDiscoverySessionHost> binding_; mojo::Receiver<mojom::PrinterDiscoverySessionHost> receiver_;
mojom::PrinterDiscoverySessionInstancePtr instance_; mojom::PrinterDiscoverySessionInstancePtr instance_;
ArcPrintServiceImpl* const service_; ArcPrintServiceImpl* const service_;
...@@ -376,14 +377,14 @@ printing::DuplexMode FromArcDuplexMode(mojom::PrintDuplexMode mode) { ...@@ -376,14 +377,14 @@ printing::DuplexMode FromArcDuplexMode(mojom::PrintDuplexMode mode) {
class PrintJobHostImpl : public mojom::PrintJobHost, class PrintJobHostImpl : public mojom::PrintJobHost,
public content::NotificationObserver { public content::NotificationObserver {
public: public:
PrintJobHostImpl(mojo::InterfaceRequest<mojom::PrintJobHost> request, PrintJobHostImpl(mojo::PendingReceiver<mojom::PrintJobHost> receiver,
mojom::PrintJobInstancePtr instance, mojom::PrintJobInstancePtr instance,
ArcPrintServiceImpl* service, ArcPrintServiceImpl* service,
chromeos::CupsPrintJobManager* job_manager, chromeos::CupsPrintJobManager* job_manager,
std::unique_ptr<printing::PrintSettings> settings, std::unique_ptr<printing::PrintSettings> settings,
base::File file, base::File file,
size_t data_size) size_t data_size)
: binding_(this, std::move(request)), : receiver_(this, std::move(receiver)),
instance_(std::move(instance)), instance_(std::move(instance)),
service_(service), service_(service),
job_manager_(job_manager) { job_manager_(job_manager) {
...@@ -401,7 +402,7 @@ class PrintJobHostImpl : public mojom::PrintJobHost, ...@@ -401,7 +402,7 @@ class PrintJobHostImpl : public mojom::PrintJobHost,
base::BindOnce(&CreateQueryOnIOThread, std::move(settings), base::BindOnce(&CreateQueryOnIOThread, std::move(settings),
base::BindOnce(&PrintJobHostImpl::OnSetSettingsDone, base::BindOnce(&PrintJobHostImpl::OnSetSettingsDone,
weak_ptr_factory_.GetWeakPtr()))); weak_ptr_factory_.GetWeakPtr())));
binding_.set_connection_error_handler(MakeErrorHandler()); receiver_.set_disconnect_handler(MakeErrorHandler());
instance_.set_connection_error_handler(MakeErrorHandler()); instance_.set_connection_error_handler(MakeErrorHandler());
} }
...@@ -502,7 +503,7 @@ class PrintJobHostImpl : public mojom::PrintJobHost, ...@@ -502,7 +503,7 @@ class PrintJobHostImpl : public mojom::PrintJobHost,
} }
// Binds the lifetime of |this| to the Mojo connection. // Binds the lifetime of |this| to the Mojo connection.
mojo::Binding<mojom::PrintJobHost> binding_; mojo::Receiver<mojom::PrintJobHost> receiver_;
mojom::PrintJobInstancePtr instance_; mojom::PrintJobInstancePtr instance_;
ArcPrintServiceImpl* const service_; ArcPrintServiceImpl* const service_;
......
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