| Index: chrome/service/service_utility_process_host.h
|
| diff --git a/chrome/service/service_utility_process_host.h b/chrome/service/service_utility_process_host.h
|
| index d0dea943390b3ed589ba630b6f10b157eb11a85b..be8f0f278839747109ee3748d62b1af835a9c34c 100644
|
| --- a/chrome/service/service_utility_process_host.h
|
| +++ b/chrome/service/service_utility_process_host.h
|
| @@ -11,6 +11,7 @@
|
| #include "base/macros.h"
|
| #include "base/memory/ref_counted.h"
|
| #include "base/memory/weak_ptr.h"
|
| +#include "components/printing/common/printing.mojom.h"
|
| #include "content/public/common/child_process_host_delegate.h"
|
| #include "ipc/ipc_platform_file.h"
|
|
|
| @@ -106,8 +107,6 @@ class ServiceUtilityProcessHost : public content::ChildProcessHostDelegate {
|
| bool StartGetPrinterSemanticCapsAndDefaults(const std::string& printer_name);
|
|
|
| protected:
|
| - bool Send(IPC::Message* msg);
|
| -
|
| // Allows this method to be overridden for tests.
|
| virtual base::FilePath GetUtilityProcessCmd();
|
|
|
| @@ -131,15 +130,16 @@ class ServiceUtilityProcessHost : public content::ChildProcessHostDelegate {
|
| // Messages handlers:
|
| void OnRenderPDFPagesToMetafilesPageCount(int page_count);
|
| void OnRenderPDFPagesToMetafilesPageDone(bool success, float scale_factor);
|
| - void OnGetPrinterCapsAndDefaultsSucceeded(
|
| + void OnGetPrinterCapsAndDefaults(
|
| const std::string& printer_name,
|
| - const printing::PrinterCapsAndDefaults& caps_and_defaults);
|
| - void OnGetPrinterCapsAndDefaultsFailed(const std::string& printer_name);
|
| - void OnGetPrinterSemanticCapsAndDefaultsSucceeded(
|
| + const base::Optional<printing::PrinterCapsAndDefaults>&
|
| + caps_and_defaults);
|
| + void OnGetPrinterSemanticCapsAndDefaults(
|
| const std::string& printer_name,
|
| - const printing::PrinterSemanticCapsAndDefaults& caps_and_defaults);
|
| - void OnGetPrinterSemanticCapsAndDefaultsFailed(
|
| - const std::string& printer_name);
|
| + const base::Optional<printing::PrinterSemanticCapsAndDefaults>&
|
| + caps_and_defaults);
|
| +
|
| + printing::mojom::Printing* GetPrinting();
|
|
|
| std::unique_ptr<content::ChildProcessHost> child_process_host_;
|
| base::Process process_;
|
| @@ -155,6 +155,8 @@ class ServiceUtilityProcessHost : public content::ChildProcessHostDelegate {
|
| class PdfToEmfState;
|
| std::unique_ptr<PdfToEmfState> pdf_to_emf_state_;
|
|
|
| + printing::mojom::PrintingPtr printing_;
|
| +
|
| base::WeakPtrFactory<ServiceUtilityProcessHost> weak_ptr_factory_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ServiceUtilityProcessHost);
|
|
|