Chromium Code Reviews| 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..d1c0438595af32667cc26396dc3f75839c0401b9 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,14 @@ 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); |
| std::unique_ptr<content::ChildProcessHost> child_process_host_; |
| base::Process process_; |
| @@ -155,6 +153,9 @@ class ServiceUtilityProcessHost : public content::ChildProcessHostDelegate { |
| class PdfToEmfState; |
| std::unique_ptr<PdfToEmfState> pdf_to_emf_state_; |
| + printing::mojom::Printing* printing(); |
|
Sam McNally
2017/01/05 06:23:15
Methods before fields, and GetPrinting() if you ar
tibell
2017/01/12 03:30:15
Done.
|
| + printing::mojom::PrintingPtr printing_; |
|
Sam McNally
2017/01/05 06:23:15
Add a comment to use the accessor method instead.
tibell
2017/01/12 03:30:15
Done.
Sam McNally
2017/01/12 04:49:52
I don't see it.
|
| + |
| base::WeakPtrFactory<ServiceUtilityProcessHost> weak_ptr_factory_; |
| DISALLOW_COPY_AND_ASSIGN(ServiceUtilityProcessHost); |