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

Side by Side Diff: device/usb/usb_interface_android.cc

Issue 1468423003: Construct USB descriptors over explicit values. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update Android code. Created 4 years, 10 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
« no previous file with comments | « device/usb/usb_endpoint_android.cc ('k') | extensions/browser/api/usb/usb_apitest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "device/usb/usb_interface_android.h" 5 #include "device/usb/usb_interface_android.h"
6 6
7 #include "device/usb/usb_endpoint_android.h" 7 #include "device/usb/usb_endpoint_android.h"
8 #include "jni/ChromeUsbInterface_jni.h" 8 #include "jni/ChromeUsbInterface_jni.h"
9 9
10 using base::android::ScopedJavaLocalRef; 10 using base::android::ScopedJavaLocalRef;
11 11
12 namespace device { 12 namespace device {
13 13
14 // static 14 // static
15 bool UsbInterfaceAndroid::RegisterJNI(JNIEnv* env) { 15 bool UsbInterfaceAndroid::RegisterJNI(JNIEnv* env) {
16 return RegisterNativesImpl(env); // Generated in ChromeUsbInterface_jni.h 16 return RegisterNativesImpl(env); // Generated in ChromeUsbInterface_jni.h
17 } 17 }
18 18
19 // static 19 // static
20 UsbInterfaceDescriptor UsbInterfaceAndroid::Convert( 20 UsbInterfaceDescriptor UsbInterfaceAndroid::Convert(
21 JNIEnv* env, 21 JNIEnv* env,
22 const base::android::JavaRef<jobject>& usb_interface) { 22 const base::android::JavaRef<jobject>& usb_interface) {
23 ScopedJavaLocalRef<jobject> wrapper = 23 ScopedJavaLocalRef<jobject> wrapper =
24 Java_ChromeUsbInterface_create(env, usb_interface.obj()); 24 Java_ChromeUsbInterface_create(env, usb_interface.obj());
25 25
26 UsbInterfaceDescriptor interface; 26 UsbInterfaceDescriptor interface(
27 interface.interface_number = 27 Java_ChromeUsbInterface_getInterfaceNumber(env, wrapper.obj()),
28 Java_ChromeUsbInterface_getInterfaceNumber(env, wrapper.obj()); 28 Java_ChromeUsbInterface_getAlternateSetting(env, wrapper.obj()),
29 interface.alternate_setting = 29 Java_ChromeUsbInterface_getInterfaceClass(env, wrapper.obj()),
30 Java_ChromeUsbInterface_getAlternateSetting(env, wrapper.obj()); 30 Java_ChromeUsbInterface_getInterfaceSubclass(env, wrapper.obj()),
31 interface.interface_class = 31 Java_ChromeUsbInterface_getInterfaceProtocol(env, wrapper.obj()));
32 Java_ChromeUsbInterface_getInterfaceClass(env, wrapper.obj());
33 interface.interface_subclass =
34 Java_ChromeUsbInterface_getInterfaceSubclass(env, wrapper.obj());
35 interface.interface_protocol =
36 Java_ChromeUsbInterface_getInterfaceProtocol(env, wrapper.obj());
37 32
38 ScopedJavaLocalRef<jobjectArray> endpoints = 33 ScopedJavaLocalRef<jobjectArray> endpoints =
39 Java_ChromeUsbInterface_getEndpoints(env, wrapper.obj()); 34 Java_ChromeUsbInterface_getEndpoints(env, wrapper.obj());
40 jsize count = env->GetArrayLength(endpoints.obj()); 35 jsize count = env->GetArrayLength(endpoints.obj());
41 interface.endpoints.reserve(count); 36 interface.endpoints.reserve(count);
42 for (jsize i = 0; i < count; ++i) { 37 for (jsize i = 0; i < count; ++i) {
43 ScopedJavaLocalRef<jobject> endpoint( 38 ScopedJavaLocalRef<jobject> endpoint(
44 env, env->GetObjectArrayElement(endpoints.obj(), i)); 39 env, env->GetObjectArrayElement(endpoints.obj(), i));
45 interface.endpoints.push_back(UsbEndpointAndroid::Convert(env, endpoint)); 40 interface.endpoints.push_back(UsbEndpointAndroid::Convert(env, endpoint));
46 } 41 }
47 42
48 return interface; 43 return interface;
49 } 44 }
50 45
51 } // namespace device 46 } // namespace device
OLDNEW
« no previous file with comments | « device/usb/usb_endpoint_android.cc ('k') | extensions/browser/api/usb/usb_apitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698