diff options
| author | gdk@chromium.org <gdk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-10 22:52:57 +0000 |
|---|---|---|
| committer | gdk@chromium.org <gdk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-10 22:52:57 +0000 |
| commit | 30bd16773e43d552771f6a873be8eeddd789a2d7 (patch) | |
| tree | cd4638069033d028b10194d1b94855cc937650a8 /chrome/browser | |
| parent | 37e056b784278969c38867c8f9d3ede2775beef8 (diff) | |
| download | chromium_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')
| -rw-r--r-- | chrome/browser/usb/usb_device.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/usb/usb_device.h | 2 | ||||
| -rw-r--r-- | chrome/browser/usb/usb_service.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/usb/usb_service.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/usb/usb_device.cc b/chrome/browser/usb/usb_device.cc index 9417f9d..b3ae7ce 100644 --- a/chrome/browser/usb/usb_device.cc +++ b/chrome/browser/usb/usb_device.cc @@ -7,7 +7,7 @@ #include "base/stl_util.h" #include "base/synchronization/lock.h" #include "chrome/browser/usb/usb_service.h" -#include "third_party/libusb/libusb/libusb.h" +#include "third_party/libusb/libusb.h" namespace { diff --git a/chrome/browser/usb/usb_device.h b/chrome/browser/usb/usb_device.h index ffb38d3..6ac4030 100644 --- a/chrome/browser/usb/usb_device.h +++ b/chrome/browser/usb/usb_device.h @@ -12,7 +12,7 @@ #include "base/synchronization/lock.h" #include "net/base/completion_callback.h" #include "net/base/io_buffer.h" -#include "third_party/libusb/libusb/libusb.h" +#include "third_party/libusb/libusb.h" typedef libusb_device* PlatformUsbDevice; typedef libusb_device_handle* PlatformUsbDeviceHandle; 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(); } diff --git a/chrome/browser/usb/usb_service.h b/chrome/browser/usb/usb_service.h index 3f11a7d..18e9791 100644 --- a/chrome/browser/usb/usb_service.h +++ b/chrome/browser/usb/usb_service.h @@ -13,7 +13,7 @@ #include "base/threading/thread.h" #include "chrome/browser/profiles/profile_keyed_service.h" #include "chrome/browser/usb/usb_device.h" -#include "third_party/libusb/libusb/libusb.h" +#include "third_party/libusb/libusb.h" typedef libusb_context* PlatformUsbContext; |