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

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

Issue 10694106: Added support for multiple parameters to Extension API callbacks. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Synced. Created 8 years, 5 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/extensions/api/usb/usb_api.cc
diff --git a/chrome/browser/extensions/api/usb/usb_api.cc b/chrome/browser/extensions/api/usb/usb_api.cc
index a11b0c557fd87eca68e6ca997cbf10f3c263f638..bb841864cadd1f2f65a0b1c341ba46c76151d14e 100644
--- a/chrome/browser/extensions/api/usb/usb_api.cc
+++ b/chrome/browser/extensions/api/usb/usb_api.cc
@@ -46,7 +46,7 @@ void UsbFindDeviceFunction::Work() {
UsbDevice* const device = service->FindDevice(parameters_->vendor_id,
parameters_->product_id);
if (!device) {
- result_.reset(base::Value::CreateNullValue());
+ SetResult(base::Value::CreateNullValue());
return;
}
@@ -57,7 +57,7 @@ void UsbFindDeviceFunction::Work() {
result.handle = controller()->AddAPIResource(resource);
result.vendor_id = parameters_->vendor_id;
result.product_id = parameters_->product_id;
- result_ = result.ToValue();
+ SetResult(FindDevice::Result::Create(result));
}
bool UsbFindDeviceFunction::Respond() {

Powered by Google App Engine
This is Rietveld 408576698