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

Unified Diff: chrome/browser/usb/usb_chooser_controller.cc

Issue 2615353002: Typemap device.usb.DeviceFilter to device::UsbDeviceFilter. (Closed)
Patch Set: Addressed juncai@'s feedback. Created 3 years, 11 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
« no previous file with comments | « chrome/browser/usb/usb_chooser_controller.h ('k') | chrome/browser/usb/usb_chooser_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 e9e12fff88a9c9bb90c8ee5439fa82f36b4d34e0..ddd08f89a2761a052c38b1794a8f9a01a5b07f9f 100644
--- a/chrome/browser/usb/usb_chooser_controller.cc
+++ b/chrome/browser/usb/usb_chooser_controller.cc
@@ -72,8 +72,8 @@ base::string16 GetDeviceName(scoped_refptr<device::UsbDevice> device) {
} // namespace
UsbChooserController::UsbChooserController(
- content::RenderFrameHost* render_frame_host,
- const std::vector<device::usb::DeviceFilterPtr>& device_filters,
+ RenderFrameHost* render_frame_host,
+ const std::vector<device::UsbDeviceFilter>& device_filters,
const device::usb::ChooserService::GetPermissionCallback& callback)
: ChooserController(render_frame_host,
IDS_USB_DEVICE_CHOOSER_PROMPT_ORIGIN,
@@ -81,6 +81,7 @@ UsbChooserController::UsbChooserController(
render_frame_host_(render_frame_host),
callback_(callback),
usb_service_observer_(this),
+ filters_(device_filters),
weak_factory_(this) {
device::UsbService* usb_service =
device::DeviceClient::Get()->GetUsbService();
@@ -90,9 +91,6 @@ UsbChooserController::UsbChooserController(
if (!usb_service_observer_.IsObserving(usb_service))
usb_service_observer_.Add(usb_service);
- filters_ =
- mojo::ConvertTo<std::vector<device::UsbDeviceFilter>>(device_filters);
-
usb_service->GetDevices(base::Bind(&UsbChooserController::GotUsbDeviceList,
weak_factory_.GetWeakPtr()));
}
« no previous file with comments | « chrome/browser/usb/usb_chooser_controller.h ('k') | chrome/browser/usb/usb_chooser_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698