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

Unified Diff: chrome/browser/chromeos/printer_detector/legacy_printer_detector.cc

Issue 2738323003: Implement basic USB setup in the cups printer detector. Factor out (Closed)
Patch Set: Fix ppd provider lifetime. It was being inappropriately deleted which meant it caused USB resoluti… Created 3 years, 9 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: chrome/browser/chromeos/printer_detector/legacy_printer_detector.cc
diff --git a/chrome/browser/chromeos/printer_detector/legacy_printer_detector.cc b/chrome/browser/chromeos/printer_detector/legacy_printer_detector.cc
index c2b1c2a188da36c42860f979d1e207d3280f7a58..0a0e450410e886e7845ebcd17bb3a9f0d2f1d392 100644
--- a/chrome/browser/chromeos/printer_detector/legacy_printer_detector.cc
+++ b/chrome/browser/chromeos/printer_detector/legacy_printer_detector.cc
@@ -17,6 +17,7 @@
#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/chromeos/printer_detector/printer_detector.h"
+#include "chrome/browser/chromeos/printing/usb_printer_util.h"
#include "chrome/browser/chromeos/profiles/profile_helper.h"
#include "chrome/browser/notifications/notification.h"
#include "chrome/browser/notifications/notification_delegate.h"
@@ -58,10 +59,6 @@ const char kPrinterProviderFoundNotificationID[] =
const char kNoPrinterProviderNotificationID[] =
"chrome://settings/printer/no_printer_app";
-// Base class used for printer USB interfaces
-// (https://www.usb.org/developers/defined_class).
-const uint8_t kPrinterInterfaceClass = 7;
-
enum PrinterServiceEvent {
PRINTER_ADDED,
DEPRECATED_PAGE_DISPLAYED,
@@ -233,10 +230,9 @@ class LegacyPrinterDetectorImpl : public PrinterDetector,
return;
}
- device::UsbDeviceFilter printer_filter;
- printer_filter.interface_class = kPrinterInterfaceClass;
- if (!printer_filter.Matches(device))
+ if (!UsbDeviceIsPrinter(device)) {
return;
+ }
if (notification_ui_manager_ == nullptr) {
notification_ui_manager_ = g_browser_process->notification_ui_manager();

Powered by Google App Engine
This is Rietveld 408576698