Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(55)

Unified Diff: extensions/common/api/printer_provider/usb_printer_manifest_data.cc

Issue 1153173002: Include USB printers in printer list as "provisional" devices. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: extensions/common/api/printer_provider/usb_printer_manifest_data.cc
diff --git a/extensions/common/api/printer_provider/usb_printer_manifest_data.cc b/extensions/common/api/printer_provider/usb_printer_manifest_data.cc
index 61dc9e83bbead07cb385cdeaf0c91b279b754d75..207894fda74175d70778a98bc89f30c19b89850f 100644
--- a/extensions/common/api/printer_provider/usb_printer_manifest_data.cc
+++ b/extensions/common/api/printer_provider/usb_printer_manifest_data.cc
@@ -5,10 +5,13 @@
#include "extensions/common/api/printer_provider/usb_printer_manifest_data.h"
#include "base/strings/utf_string_conversions.h"
+#include "device/usb/usb_device.h"
#include "device/usb/usb_device_filter.h"
#include "extensions/common/api/extensions_manifest_types.h"
#include "extensions/common/manifest_constants.h"
+using device::UsbDeviceFilter;
+
namespace extensions {
UsbPrinterManifestData::UsbPrinterManifestData() {
@@ -37,7 +40,7 @@ scoped_ptr<UsbPrinterManifestData> UsbPrinterManifestData::FromValue(
scoped_ptr<UsbPrinterManifestData> result(new UsbPrinterManifestData());
for (const auto& input : usb_printers->filters) {
DCHECK(input.get());
- device::UsbDeviceFilter output;
+ UsbDeviceFilter output;
output.SetVendorId(input->vendor_id);
if (input->product_id && input->interface_class) {
*error = base::ASCIIToUTF16(
@@ -61,4 +64,9 @@ scoped_ptr<UsbPrinterManifestData> UsbPrinterManifestData::FromValue(
return result.Pass();
}
+bool UsbPrinterManifestData::SupportsDevice(
+ scoped_refptr<device::UsbDevice> device) const {
+ return UsbDeviceFilter::MatchesAny(device, filters_);
+}
+
} // namespace extensions

Powered by Google App Engine
This is Rietveld 408576698