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

Side by Side Diff: chrome/browser/ui/android/usb_chooser_dialog_android.cc

Issue 2607063002: Remove mojo::Array. (Closed)
Patch Set: rebase 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 unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/android/usb_chooser_dialog_android.h" 5 #include "chrome/browser/ui/android/usb_chooser_dialog_android.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 10
(...skipping 11 matching lines...) Expand all
22 #include "components/url_formatter/elide_url.h" 22 #include "components/url_formatter/elide_url.h"
23 #include "content/public/browser/android/content_view_core.h" 23 #include "content/public/browser/android/content_view_core.h"
24 #include "content/public/browser/render_frame_host.h" 24 #include "content/public/browser/render_frame_host.h"
25 #include "content/public/browser/web_contents.h" 25 #include "content/public/browser/web_contents.h"
26 #include "device/base/device_client.h" 26 #include "device/base/device_client.h"
27 #include "device/usb/mojo/type_converters.h" 27 #include "device/usb/mojo/type_converters.h"
28 #include "device/usb/usb_device.h" 28 #include "device/usb/usb_device.h"
29 #include "device/usb/usb_device_filter.h" 29 #include "device/usb/usb_device_filter.h"
30 #include "device/usb/webusb_descriptors.h" 30 #include "device/usb/webusb_descriptors.h"
31 #include "jni/UsbChooserDialog_jni.h" 31 #include "jni/UsbChooserDialog_jni.h"
32 #include "mojo/common/common_type_converters.h"
33 #include "ui/android/window_android.h" 32 #include "ui/android/window_android.h"
34 #include "url/gurl.h" 33 #include "url/gurl.h"
35 34
36 using device::UsbDevice; 35 using device::UsbDevice;
37 36
38 namespace { 37 namespace {
39 38
40 void OnDevicePermissionRequestComplete( 39 void OnDevicePermissionRequestComplete(
41 scoped_refptr<UsbDevice> device, 40 scoped_refptr<UsbDevice> device,
42 const device::usb::ChooserService::GetPermissionCallback& callback, 41 const device::usb::ChooserService::GetPermissionCallback& callback,
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
237 236
238 return device::FindInWebUsbAllowedOrigins( 237 return device::FindInWebUsbAllowedOrigins(
239 device->webusb_allowed_origins(), 238 device->webusb_allowed_origins(),
240 render_frame_host_->GetLastCommittedURL().GetOrigin()); 239 render_frame_host_->GetLastCommittedURL().GetOrigin());
241 } 240 }
242 241
243 // static 242 // static
244 bool UsbChooserDialogAndroid::Register(JNIEnv* env) { 243 bool UsbChooserDialogAndroid::Register(JNIEnv* env) {
245 return RegisterNativesImpl(env); 244 return RegisterNativesImpl(env);
246 } 245 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698