Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: add logging for print_backend failures #31286

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion shell/browser/api/electron_api_printing.cc
Expand Up @@ -47,7 +47,10 @@ printing::PrinterList GetPrinterList() {
// TODO(deepak1556): Deprecate this api in favor of an
// async version and post a non blocing task call.
base::ThreadRestrictions::ScopedAllowIO allow_io;
print_backend->EnumeratePrinters(&printers);
printing::mojom::ResultCode code =
print_backend->EnumeratePrinters(&printers);
if (code != printing::mojom::ResultCode::kSuccess)
LOG(INFO) << "Failed to enumerate printers";
}
return printers;
}
Expand Down
34 changes: 24 additions & 10 deletions shell/browser/api/electron_api_web_contents.cc
Expand Up @@ -423,7 +423,7 @@ bool IsDeviceNameValid(const std::u16string& device_name) {
return true;
}

std::u16string GetDefaultPrinterAsync() {
std::pair<std::string, std::u16string> GetDefaultPrinterAsync() {
#if defined(OS_WIN)
// Blocking is needed here because Windows printer drivers are oftentimes
// not thread-safe and have to be accessed on the UI thread.
Expand All @@ -434,18 +434,25 @@ std::u16string GetDefaultPrinterAsync() {
printing::PrintBackend::CreateInstance(
g_browser_process->GetApplicationLocale());
std::string printer_name;
print_backend->GetDefaultPrinterName(printer_name);
printing::mojom::ResultCode code =
print_backend->GetDefaultPrinterName(printer_name);

// Some devices won't have a default printer, so we should
// also check for existing printers and pick the first
// one should it exist.
// We don't want to return if this fails since some devices won't have a
// default printer.
if (code != printing::mojom::ResultCode::kSuccess)
LOG(ERROR) << "Failed to get default printer name";

// Check for existing printers and pick the first one should it exist.
if (printer_name.empty()) {
printing::PrinterList printers;
print_backend->EnumeratePrinters(&printers);
if (print_backend->EnumeratePrinters(&printers) !=
printing::mojom::ResultCode::kSuccess)
return std::make_pair("Failed to enumerate printers", std::u16string());
if (!printers.empty())
printer_name = printers.front().printer_name;
}
return base::UTF8ToUTF16(printer_name);

return std::make_pair(std::string(), base::UTF8ToUTF16(printer_name));
}

// Copied from
Expand Down Expand Up @@ -2457,7 +2464,8 @@ void WebContents::OnGetDefaultPrinter(
printing::CompletionCallback print_callback,
std::u16string device_name,
bool silent,
std::u16string default_printer) {
// <error, default_printer>
std::pair<std::string, std::u16string> info) {
// The content::WebContents might be already deleted at this point, and the
// PrintViewManagerElectron class does not do null check.
if (!web_contents()) {
Expand All @@ -2466,8 +2474,14 @@ void WebContents::OnGetDefaultPrinter(
return;
}

std::u16string printer_name =
device_name.empty() ? default_printer : device_name;
if (!info.first.empty()) {
if (print_callback)
std::move(print_callback).Run(false, info.first);
return;
}

// If the user has passed a deviceName use it, otherwise use default printer.
std::u16string printer_name = device_name.empty() ? info.second : device_name;

// If there are no valid printers available on the network, we bail.
if (printer_name.empty() || !IsDeviceNameValid(printer_name)) {
Expand Down
3 changes: 2 additions & 1 deletion shell/browser/api/electron_api_web_contents.h
Expand Up @@ -222,7 +222,8 @@ class WebContents : public gin::Wrappable<WebContents>,
printing::CompletionCallback print_callback,
std::u16string device_name,
bool silent,
std::u16string default_printer);
// <error, default_printer_name>
std::pair<std::string, std::u16string> info);
void Print(gin::Arguments* args);
// Print current page as PDF.
v8::Local<v8::Promise> PrintToPDF(base::DictionaryValue settings);
Expand Down