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

Unified Diff: extensions/browser/api/usb/usb_api.cc

Issue 507503002: Remove BrowserThread dependency from usb_service. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add comments describing the new DeviceClient classes. Created 6 years, 4 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/browser/api/usb/usb_api.cc
diff --git a/extensions/browser/api/usb/usb_api.cc b/extensions/browser/api/usb/usb_api.cc
index 012cc57aadc5923f3e4d61f107e623a17de37d3e..653d037289380cb3c566ecaa352460d7e0104f44 100644
--- a/extensions/browser/api/usb/usb_api.cc
+++ b/extensions/browser/api/usb/usb_api.cc
@@ -11,6 +11,7 @@
#include "base/message_loop/message_loop_proxy.h"
#include "components/usb_service/usb_device_handle.h"
#include "components/usb_service/usb_service.h"
+#include "device/common/device_client.h"
#include "extensions/browser/api/usb/usb_device_resource.h"
#include "extensions/browser/extension_system.h"
#include "extensions/common/api/usb.h"
@@ -429,7 +430,7 @@ scoped_refptr<UsbDevice> UsbAsyncApiFunction::GetDeviceOrOrCompleteWithError(
return NULL;
}
- UsbService* service = UsbService::GetInstance();
+ UsbService* service = device::DeviceClient::Get()->GetUsbService();
if (!service) {
CompleteWithError(kErrorInitService);
return NULL;
@@ -560,7 +561,7 @@ void UsbFindDevicesFunction::AsyncWorkStart() {
return;
}
- UsbService* service = UsbService::GetInstance();
+ UsbService* service = device::DeviceClient::Get()->GetUsbService();
if (!service) {
CompleteWithError(kErrorInitService);
return;
@@ -636,7 +637,7 @@ void UsbGetDevicesFunction::AsyncWorkStart() {
return;
}
- UsbService* service = UsbService::GetInstance();
+ UsbService* service = device::DeviceClient::Get()->GetUsbService();
if (!service) {
CompleteWithError(kErrorInitService);
return;

Powered by Google App Engine
This is Rietveld 408576698