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

Unified Diff: chrome/browser/ui/android/usb_chooser_dialog_android.cc

Issue 2234443002: Mojo C++ binding: make device/usb mojom targets use STD string/vector types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move the vector converter into a private header. Created 4 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: chrome/browser/ui/android/usb_chooser_dialog_android.cc
diff --git a/chrome/browser/ui/android/usb_chooser_dialog_android.cc b/chrome/browser/ui/android/usb_chooser_dialog_android.cc
index 6026fed341672954c0bd680959514597cc65f021..c57db388e0b8c6b05d84c18d634981fafdb148be 100644
--- a/chrome/browser/ui/android/usb_chooser_dialog_android.cc
+++ b/chrome/browser/ui/android/usb_chooser_dialog_android.cc
@@ -28,6 +28,7 @@
#include "device/usb/usb_device_filter.h"
#include "device/usb/webusb_descriptors.h"
#include "jni/UsbChooserDialog_jni.h"
+#include "mojo/common/common_type_converters.h"
#include "ui/android/window_android.h"
#include "url/gurl.h"
@@ -48,12 +49,13 @@ void OnDevicePermissionRequestComplete(
} // namespace
UsbChooserDialogAndroid::UsbChooserDialogAndroid(
- mojo::Array<device::usb::DeviceFilterPtr> device_filters,
+ std::vector<device::usb::DeviceFilterPtr> filters,
content::RenderFrameHost* render_frame_host,
const device::usb::ChooserService::GetPermissionCallback& callback)
: render_frame_host_(render_frame_host),
callback_(callback),
usb_service_observer_(this),
+ filters_(mojo::ConvertTo<std::vector<device::UsbDeviceFilter>>(filters)),
weak_factory_(this) {
device::UsbService* usb_service =
device::DeviceClient::Get()->GetUsbService();
@@ -63,9 +65,6 @@ UsbChooserDialogAndroid::UsbChooserDialogAndroid(
if (!usb_service_observer_.IsObserving(usb_service))
usb_service_observer_.Add(usb_service);
- if (!device_filters.is_null())
- filters_ = device_filters.To<std::vector<device::UsbDeviceFilter>>();
-
// Create (and show) the UsbChooser dialog.
content::WebContents* web_contents =
content::WebContents::FromRenderFrameHost(render_frame_host_);

Powered by Google App Engine
This is Rietveld 408576698