Index: chrome/browser/chromeos/printing/usb_printer_util.cc |
diff --git a/chrome/browser/chromeos/printing/usb_printer_util.cc b/chrome/browser/chromeos/printing/usb_printer_util.cc |
index 28ae5c15e147464d74a227060c432c1ebfe28c42..011b33d8bd939ab43afbd27acac34185bb34efd0 100644 |
--- a/chrome/browser/chromeos/printing/usb_printer_util.cc |
+++ b/chrome/browser/chromeos/printing/usb_printer_util.cc |
@@ -146,12 +146,16 @@ std::string UsbPrinterDeviceDetailsAsString(const device::UsbDevice& device) { |
// from arbitrary devices. |
std::unique_ptr<Printer> UsbDeviceToPrinter(const device::UsbDevice& device) { |
// Preflight all required fields and log errors if we find something wrong. |
- if (device.vendor_id() == 0 || device.product_id() == 0 || |
- device.manufacturer_string().empty() || device.product_string().empty()) { |
+ if (device.vendor_id() == 0 || device.product_id() == 0) { |
LOG(ERROR) << "Failed to convert USB device to printer. Fields were:\n" |
<< UsbPrinterDeviceDetailsAsString(device); |
return nullptr; |
} |
+ if (device.manufacturer_string().empty() || device.product_string().empty()) { |
+ LOG(WARNING) |
+ << "Usb printer device missing make/model metadata. Fields were:\n" |
+ << UsbPrinterDeviceDetailsAsString(device); |
skau
2017/07/10 21:24:18
I would just skip the log. We should be pretty to
Carlson
2017/07/10 21:32:01
Added some logic to make the display name less cry
|
+ } |
auto printer = base::MakeUnique<Printer>(); |
printer->set_manufacturer(base::UTF16ToUTF8(device.manufacturer_string())); |