Chromium Code Reviews| Index: chrome/browser/usb/usb_chooser_controller.cc |
| diff --git a/chrome/browser/usb/usb_chooser_controller.cc b/chrome/browser/usb/usb_chooser_controller.cc |
| index a08a9626b22d2bfd5a471e0fab05667716fbd339..b636dfbbff8826e4d9b48b073f4672d1983e0964 100644 |
| --- a/chrome/browser/usb/usb_chooser_controller.cc |
| +++ b/chrome/browser/usb/usb_chooser_controller.cc |
| @@ -76,7 +76,7 @@ base::string16 GetDeviceName(scoped_refptr<UsbDevice> device) { |
| UsbChooserController::UsbChooserController( |
| RenderFrameHost* render_frame_host, |
| const std::vector<UsbDeviceFilter>& device_filters, |
| - const device::usb::ChooserService::GetPermissionCallback& callback) |
| + const device::mojom::UsbChooserService::GetPermissionCallback& callback) |
| : ChooserController(render_frame_host, |
| IDS_USB_DEVICE_CHOOSER_PROMPT_ORIGIN, |
| IDS_USB_DEVICE_CHOOSER_PROMPT_EXTENSION_NAME), |
| @@ -160,8 +160,8 @@ void UsbChooserController::Select(const std::vector<size_t>& indices) { |
| requesting_origin_, embedding_origin_, devices_[index].first->guid()); |
| } |
| - device::usb::DeviceInfoPtr device_info_ptr = |
| - device::usb::DeviceInfo::From(*devices_[index].first); |
| + auto device_info_ptr = |
| + device::mojom::UsbDeviceInfo::From(*devices_[index].first); |
| callback_.Run(std::move(device_info_ptr)); |
|
mcasas
2017/04/14 22:00:46
nit:
callback_.Run(device::mojom::UsbDeviceInfo:
Reilly Grant (use Gerrit)
2017/04/14 22:15:30
Done.
|
| callback_.Reset(); // Reset |callback_| so that it is only run once. |