Commit f1bb2cb4 authored by Jesse Schettler's avatar Jesse Schettler Committed by Commit Bot

scanning: Pass capabilities by const reference

Since there's no benefit of passing lorgnette::ScannerCapabilities by
value (e.g. copy elision), pass it by const reference.

Bug: None
Change-Id: Ia9457c83c6aafbf7a52e32bfc1d350100d8e64fd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2424743Reviewed-by: default avatarDaniel Cheng <dcheng@chromium.org>
Commit-Queue: Jesse Schettler <jschettler@chromium.org>
Cr-Commit-Position: refs/heads/master@{#809804}
parent 982b7cf8
...@@ -26,7 +26,7 @@ class LorgnetteScannerManager : public KeyedService { ...@@ -26,7 +26,7 @@ class LorgnetteScannerManager : public KeyedService {
using GetScannerNamesCallback = using GetScannerNamesCallback =
base::OnceCallback<void(std::vector<std::string> scanner_names)>; base::OnceCallback<void(std::vector<std::string> scanner_names)>;
using GetScannerCapabilitiesCallback = base::OnceCallback<void( using GetScannerCapabilitiesCallback = base::OnceCallback<void(
base::Optional<lorgnette::ScannerCapabilities> capabilities)>; const base::Optional<lorgnette::ScannerCapabilities>& capabilities)>;
using PageCallback = base::RepeatingCallback<void(std::string scan_data)>; using PageCallback = base::RepeatingCallback<void(std::string scan_data)>;
using ScanCallback = base::OnceCallback<void(bool success)>; using ScanCallback = base::OnceCallback<void(bool success)>;
......
...@@ -202,7 +202,8 @@ class LorgnetteScannerManagerTest : public testing::Test { ...@@ -202,7 +202,8 @@ class LorgnetteScannerManagerTest : public testing::Test {
} }
void GetScannerCapabilitiesCallback( void GetScannerCapabilitiesCallback(
base::Optional<lorgnette::ScannerCapabilities> scanner_capabilities) { const base::Optional<lorgnette::ScannerCapabilities>&
scanner_capabilities) {
scanner_capabilities_ = scanner_capabilities; scanner_capabilities_ = scanner_capabilities;
run_loop_->Quit(); run_loop_->Quit();
} }
......
...@@ -78,7 +78,7 @@ void ScanService::OnScannerNamesReceived( ...@@ -78,7 +78,7 @@ void ScanService::OnScannerNamesReceived(
void ScanService::OnScannerCapabilitiesReceived( void ScanService::OnScannerCapabilitiesReceived(
GetScannerCapabilitiesCallback callback, GetScannerCapabilitiesCallback callback,
base::Optional<lorgnette::ScannerCapabilities> capabilities) { const base::Optional<lorgnette::ScannerCapabilities>& capabilities) {
if (!capabilities) { if (!capabilities) {
LOG(ERROR) << "Failed to get scanner capabilities."; LOG(ERROR) << "Failed to get scanner capabilities.";
std::move(callback).Run(mojo_ipc::ScannerCapabilities::New()); std::move(callback).Run(mojo_ipc::ScannerCapabilities::New());
......
...@@ -54,7 +54,7 @@ class ScanService : public scanning::mojom::ScanService, public KeyedService { ...@@ -54,7 +54,7 @@ class ScanService : public scanning::mojom::ScanService, public KeyedService {
// LorgnetteScannerManager::GetScannerCapabilities(). // LorgnetteScannerManager::GetScannerCapabilities().
void OnScannerCapabilitiesReceived( void OnScannerCapabilitiesReceived(
GetScannerCapabilitiesCallback callback, GetScannerCapabilitiesCallback callback,
base::Optional<lorgnette::ScannerCapabilities> capabilities); const base::Optional<lorgnette::ScannerCapabilities>& capabilities);
// Map of scanner IDs to display names. Used to pass the correct display name // Map of scanner IDs to display names. Used to pass the correct display name
// to LorgnetteScannerManager when clients provide an ID. // to LorgnetteScannerManager when clients provide an ID.
......
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