summaryrefslogtreecommitdiffstats
path: root/chrome/browser/usb/usb_service.cc
diff options
context:
space:
mode:
authorgdk@chromium.org <gdk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-10 22:52:57 +0000
committergdk@chromium.org <gdk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-10 22:52:57 +0000
commit30bd16773e43d552771f6a873be8eeddd789a2d7 (patch)
treecd4638069033d028b10194d1b94855cc937650a8 /chrome/browser/usb/usb_service.cc
parent37e056b784278969c38867c8f9d3ede2775beef8 (diff)
downloadchromium_src-30bd16773e43d552771f6a873be8eeddd789a2d7.zip
chromium_src-30bd16773e43d552771f6a873be8eeddd789a2d7.tar.gz
chromium_src-30bd16773e43d552771f6a873be8eeddd789a2d7.tar.bz2
Adding use_system_libusb option for third_party/libusb
There are build and distribution configurations under which packaged libraries cannot be included. The use_system_libusb option allows these platforms (Linux, currently) to use the pre-installed libusb. BUG=124803 TEST=none Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=136127 Review URL: https://chromiumcodereview.appspot.com/10332075 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136421 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/usb/usb_service.cc')
-rw-r--r--chrome/browser/usb/usb_service.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/usb/usb_service.cc b/chrome/browser/usb/usb_service.cc
index ad172d8..c69c40c 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,7 @@ void UsbService::PostHandleEventTask() {
}
void UsbService::HandleEvent() {
- libusb_handle_events_completed(context_, NULL);
+ libusb_handle_events(context_);
if (running_) {
PostHandleEventTask();
}