From 3a48a1d1d9f2e3026069d30f6272fafe89448048 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Sat, 25 Mar 2023 02:10:46 +0000 Subject: [PATCH] Make PrintBackendService::GetPrinterSemanticCapsAndDefaults() Ash-only This Mojo interface is only called on Chrome OS Ash. Change-Id: I6b5e4d1ab1a6df7b8f3900446ea8c1a8d96c4cc6 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4368541 Commit-Queue: Lei Zhang Reviewed-by: Alan Screen Reviewed-by: Will Harris Cr-Commit-Position: refs/heads/main@{#1122047} --- chrome/browser/printing/print_backend_browsertest.cc | 3 +++ chrome/browser/printing/print_backend_service_manager.cc | 3 +++ chrome/browser/printing/print_backend_service_manager.h | 3 +++ chrome/browser/printing/print_backend_service_test_impl.cc | 4 ++++ chrome/browser/printing/print_backend_service_test_impl.h | 3 +++ chrome/services/printing/print_backend_service_impl.cc | 3 +++ chrome/services/printing/print_backend_service_impl.h | 3 +++ .../printing/public/mojom/print_backend_service.mojom | 1 + 8 files changed, 23 insertions(+) diff --git a/chrome/browser/printing/print_backend_browsertest.cc b/chrome/browser/printing/print_backend_browsertest.cc index d10a1869b0192e..ddc35c2cb83d34 100644 --- a/chrome/browser/printing/print_backend_browsertest.cc +++ b/chrome/browser/printing/print_backend_browsertest.cc @@ -22,6 +22,7 @@ #include "base/threading/thread_restrictions.h" #include "base/values.h" #include "build/build_config.h" +#include "build/chromeos_buildflags.h" #include "chrome/browser/printing/print_backend_service_test_impl.h" #include "chrome/common/chrome_paths.h" #include "chrome/services/printing/public/mojom/print_backend_service.mojom.h" @@ -444,6 +445,7 @@ IN_PROC_BROWSER_TEST_F(PrintBackendBrowserTest, GetDefaultPrinterName) { kDefaultPrinterName); } +#if BUILDFLAG(IS_CHROMEOS_ASH) IN_PROC_BROWSER_TEST_F(PrintBackendBrowserTest, GetPrinterSemanticCapsAndDefaults) { LaunchService(); @@ -493,6 +495,7 @@ IN_PROC_BROWSER_TEST_F(PrintBackendBrowserTest, ASSERT_TRUE(printer_caps->is_result_code()); EXPECT_EQ(printer_caps->get_result_code(), mojom::ResultCode::kAccessDenied); } +#endif // BUILDFLAG(IS_CHROMEOS_ASH) IN_PROC_BROWSER_TEST_F(PrintBackendBrowserTest, FetchCapabilities) { LaunchService(); diff --git a/chrome/browser/printing/print_backend_service_manager.cc b/chrome/browser/printing/print_backend_service_manager.cc index 40e9ea23389bad..84d4a27e69c114 100644 --- a/chrome/browser/printing/print_backend_service_manager.cc +++ b/chrome/browser/printing/print_backend_service_manager.cc @@ -21,6 +21,7 @@ #include "base/time/time.h" #include "base/unguessable_token.h" #include "build/build_config.h" +#include "build/chromeos_buildflags.h" #include "chrome/browser/browser_process.h" #include "chrome/grit/generated_resources.h" #include "chrome/services/printing/public/mojom/print_backend_service.mojom.h" @@ -235,6 +236,7 @@ void PrintBackendServiceManager::GetDefaultPrinterName( base::Unretained(this), std::move(context))); } +#if BUILDFLAG(IS_CHROMEOS_ASH) void PrintBackendServiceManager::GetPrinterSemanticCapsAndDefaults( const std::string& printer_name, mojom::PrintBackendService::GetPrinterSemanticCapsAndDefaultsCallback @@ -256,6 +258,7 @@ void PrintBackendServiceManager::GetPrinterSemanticCapsAndDefaults( &PrintBackendServiceManager::OnDidGetPrinterSemanticCapsAndDefaults, base::Unretained(this), std::move(context))); } +#endif // BUILDFLAG(IS_CHROMEOS_ASH) PrintBackendServiceManager::ContextId PrintBackendServiceManager::EstablishPrintingContext( diff --git a/chrome/browser/printing/print_backend_service_manager.h b/chrome/browser/printing/print_backend_service_manager.h index 753a073c4bc4a0..148a9f91702ae9 100644 --- a/chrome/browser/printing/print_backend_service_manager.h +++ b/chrome/browser/printing/print_backend_service_manager.h @@ -16,6 +16,7 @@ #include "base/unguessable_token.h" #include "base/values.h" #include "build/build_config.h" +#include "build/chromeos_buildflags.h" #include "chrome/services/printing/public/mojom/print_backend_service.mojom.h" #include "mojo/public/cpp/bindings/remote.h" #include "mojo/public/cpp/bindings/remote_set.h" @@ -132,10 +133,12 @@ class PrintBackendServiceManager { mojom::PrintBackendService::FetchCapabilitiesCallback callback); void GetDefaultPrinterName( mojom::PrintBackendService::GetDefaultPrinterNameCallback callback); +#if BUILDFLAG(IS_CHROMEOS_ASH) void GetPrinterSemanticCapsAndDefaults( const std::string& printer_name, mojom::PrintBackendService::GetPrinterSemanticCapsAndDefaultsCallback callback); +#endif ContextId EstablishPrintingContext(ClientId client_id, const std::string& printer_name #if BUILDFLAG(ENABLE_OOP_BASIC_PRINT_DIALOG) diff --git a/chrome/browser/printing/print_backend_service_test_impl.cc b/chrome/browser/printing/print_backend_service_test_impl.cc index 2aa81266ab5c9b..6b077e917650fd 100644 --- a/chrome/browser/printing/print_backend_service_test_impl.cc +++ b/chrome/browser/printing/print_backend_service_test_impl.cc @@ -12,6 +12,8 @@ #include "base/memory/scoped_refptr.h" #include "base/task/single_thread_task_runner.h" #include "base/values.h" +#include "build/build_config.h" +#include "build/chromeos_buildflags.h" #include "chrome/browser/printing/print_backend_service_manager.h" #include "printing/backend/test_print_backend.h" @@ -113,6 +115,7 @@ void PrintBackendServiceTestImpl::GetDefaultPrinterName( PrintBackendServiceImpl::GetDefaultPrinterName(std::move(callback)); } +#if BUILDFLAG(IS_CHROMEOS_ASH) void PrintBackendServiceTestImpl::GetPrinterSemanticCapsAndDefaults( const std::string& printer_name, mojom::PrintBackendService::GetPrinterSemanticCapsAndDefaultsCallback @@ -125,6 +128,7 @@ void PrintBackendServiceTestImpl::GetPrinterSemanticCapsAndDefaults( PrintBackendServiceImpl::GetPrinterSemanticCapsAndDefaults( printer_name, std::move(callback)); } +#endif // BUILDFLAG(IS_CHROMEOS_ASH) void PrintBackendServiceTestImpl::FetchCapabilities( const std::string& printer_name, diff --git a/chrome/browser/printing/print_backend_service_test_impl.h b/chrome/browser/printing/print_backend_service_test_impl.h index f10b3ddf87b10b..d97238d04bdf51 100644 --- a/chrome/browser/printing/print_backend_service_test_impl.h +++ b/chrome/browser/printing/print_backend_service_test_impl.h @@ -12,6 +12,7 @@ #include "base/task/single_thread_task_runner.h" #include "base/values.h" #include "build/build_config.h" +#include "build/chromeos_buildflags.h" #include "chrome/services/printing/print_backend_service_impl.h" #include "chrome/services/printing/public/mojom/print_backend_service.mojom.h" #include "mojo/public/cpp/bindings/pending_receiver.h" @@ -89,10 +90,12 @@ class PrintBackendServiceTestImpl : public PrintBackendServiceImpl { void GetDefaultPrinterName( mojom::PrintBackendService::GetDefaultPrinterNameCallback callback) override; +#if BUILDFLAG(IS_CHROMEOS_ASH) void GetPrinterSemanticCapsAndDefaults( const std::string& printer_name, mojom::PrintBackendService::GetPrinterSemanticCapsAndDefaultsCallback callback) override; +#endif void FetchCapabilities( const std::string& printer_name, mojom::PrintBackendService::FetchCapabilitiesCallback callback) override; diff --git a/chrome/services/printing/print_backend_service_impl.cc b/chrome/services/printing/print_backend_service_impl.cc index 3d34fa67dee5c5..fcb3dc2f55f68f 100644 --- a/chrome/services/printing/print_backend_service_impl.cc +++ b/chrome/services/printing/print_backend_service_impl.cc @@ -21,6 +21,7 @@ #include "base/threading/sequence_bound.h" #include "base/values.h" #include "build/build_config.h" +#include "build/chromeos_buildflags.h" #include "chrome/common/printing/printing_init.h" #include "chrome/services/printing/public/mojom/print_backend_service.mojom.h" #include "components/crash/core/common/crash_keys.h" @@ -501,6 +502,7 @@ void PrintBackendServiceImpl::GetDefaultPrinterName( mojom::DefaultPrinterNameResult::NewDefaultPrinterName(default_printer)); } +#if BUILDFLAG(IS_CHROMEOS_ASH) void PrintBackendServiceImpl::GetPrinterSemanticCapsAndDefaults( const std::string& printer_name, mojom::PrintBackendService::GetPrinterSemanticCapsAndDefaultsCallback @@ -522,6 +524,7 @@ void PrintBackendServiceImpl::GetPrinterSemanticCapsAndDefaults( mojom::PrinterSemanticCapsAndDefaultsResult::NewPrinterCaps( std::move(printer_caps))); } +#endif // BUILDFLAG(IS_CHROMEOS_ASH) void PrintBackendServiceImpl::FetchCapabilities( const std::string& printer_name, diff --git a/chrome/services/printing/print_backend_service_impl.h b/chrome/services/printing/print_backend_service_impl.h index de215093473f5b..f31eba3724b731 100644 --- a/chrome/services/printing/print_backend_service_impl.h +++ b/chrome/services/printing/print_backend_service_impl.h @@ -17,6 +17,7 @@ #include "base/task/sequenced_task_runner.h" #include "base/values.h" #include "build/build_config.h" +#include "build/chromeos_buildflags.h" #include "chrome/services/printing/public/mojom/print_backend_service.mojom.h" #include "mojo/public/cpp/bindings/pending_receiver.h" #include "mojo/public/cpp/bindings/receiver.h" @@ -151,10 +152,12 @@ class PrintBackendServiceImpl : public mojom::PrintBackendService { void GetDefaultPrinterName( mojom::PrintBackendService::GetDefaultPrinterNameCallback callback) override; +#if BUILDFLAG(IS_CHROMEOS_ASH) void GetPrinterSemanticCapsAndDefaults( const std::string& printer_name, mojom::PrintBackendService::GetPrinterSemanticCapsAndDefaultsCallback callback) override; +#endif void FetchCapabilities( const std::string& printer_name, mojom::PrintBackendService::FetchCapabilitiesCallback callback) override; diff --git a/chrome/services/printing/public/mojom/print_backend_service.mojom b/chrome/services/printing/public/mojom/print_backend_service.mojom index e119ff03e079db..9d79b092132430 100644 --- a/chrome/services/printing/public/mojom/print_backend_service.mojom +++ b/chrome/services/printing/public/mojom/print_backend_service.mojom @@ -102,6 +102,7 @@ interface PrintBackendService { => (DefaultPrinterNameResult printer_name); // Gets the semantic capabilities and defaults for a specific printer. + [EnableIf=is_chromeos_ash] GetPrinterSemanticCapsAndDefaults(string printer_name) => (PrinterSemanticCapsAndDefaultsResult printer_caps);