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

Unified Diff: chrome/browser/usb/usb_service.cc

Issue 10332075: Adding use_system_libusb option for third_party/libusb (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixing license check. Created 8 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: chrome/browser/usb/usb_service.cc
diff --git a/chrome/browser/usb/usb_service.cc b/chrome/browser/usb/usb_service.cc
index ad172d88508b2ac06070b809a34f40d7d85ae25f..65e9ced62c7a2e194362a7bd1698b7d67189f262 100644
--- a/chrome/browser/usb/usb_service.cc
+++ b/chrome/browser/usb/usb_service.cc
@@ -8,7 +8,7 @@
#include "base/bind_helpers.h"
#include "base/stl_util.h"
#include "chrome/browser/usb/usb_device.h"
-#include "third_party/libusb/libusb/libusb.h"
+#include "third_party/libusb/libusb.h"
UsbService::UsbService() : running_(true), thread_("UsbThread") {
libusb_init(&context_);
@@ -75,7 +75,10 @@ void UsbService::PostHandleEventTask() {
}
void UsbService::HandleEvent() {
- libusb_handle_events_completed(context_, NULL);
+ // TODO(gdk): Once there is a reasonable expectation that platforms will use
Paweł Hajdan Jr. 2012/05/10 06:36:15 Note: there is. Gentoo Linux doesn't even have any
Garret Kelly 2012/05/10 17:44:01 I'll leave the older call for compatibility's sake
+ // libusb >= 1.0.9 this should be changed to handle_events_completed, as the
+ // use of handle_events is deprecated.
+ libusb_handle_events(context_);
if (running_) {
PostHandleEventTask();
}

Powered by Google App Engine
This is Rietveld 408576698