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

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

Issue 2237943002: Remove now-unnecessary .obj() in Java method calls. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@switch-context
Patch Set: Rebase *again* :( 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 unified diff | Download patch
« no previous file with comments | « device/usb/usb_interface_android.cc ('k') | device/vr/android/cardboard/cardboard_vr_device.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_service_android.h" 5 #include "device/usb/usb_service_android.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/android/context_utils.h" 10 #include "base/android/context_utils.h"
(...skipping 18 matching lines...) Expand all
29 29
30 UsbServiceAndroid::UsbServiceAndroid( 30 UsbServiceAndroid::UsbServiceAndroid(
31 scoped_refptr<base::SequencedTaskRunner> blocking_task_runner) 31 scoped_refptr<base::SequencedTaskRunner> blocking_task_runner)
32 : UsbService(base::ThreadTaskRunnerHandle::Get(), blocking_task_runner), 32 : UsbService(base::ThreadTaskRunnerHandle::Get(), blocking_task_runner),
33 weak_factory_(this) { 33 weak_factory_(this) {
34 JNIEnv* env = AttachCurrentThread(); 34 JNIEnv* env = AttachCurrentThread();
35 j_object_.Reset( 35 j_object_.Reset(
36 Java_ChromeUsbService_create(env, base::android::GetApplicationContext(), 36 Java_ChromeUsbService_create(env, base::android::GetApplicationContext(),
37 reinterpret_cast<jlong>(this))); 37 reinterpret_cast<jlong>(this)));
38 ScopedJavaLocalRef<jobjectArray> devices = 38 ScopedJavaLocalRef<jobjectArray> devices =
39 Java_ChromeUsbService_getDevices(env, j_object_.obj()); 39 Java_ChromeUsbService_getDevices(env, j_object_);
40 jsize length = env->GetArrayLength(devices.obj()); 40 jsize length = env->GetArrayLength(devices.obj());
41 for (jsize i = 0; i < length; ++i) { 41 for (jsize i = 0; i < length; ++i) {
42 ScopedJavaLocalRef<jobject> usb_device( 42 ScopedJavaLocalRef<jobject> usb_device(
43 env, env->GetObjectArrayElement(devices.obj(), i)); 43 env, env->GetObjectArrayElement(devices.obj(), i));
44 scoped_refptr<UsbDeviceAndroid> device(UsbDeviceAndroid::Create( 44 scoped_refptr<UsbDeviceAndroid> device(UsbDeviceAndroid::Create(
45 env, weak_factory_.GetWeakPtr(), blocking_task_runner, usb_device)); 45 env, weak_factory_.GetWeakPtr(), blocking_task_runner, usb_device));
46 AddDevice(device); 46 AddDevice(device);
47 } 47 }
48 } 48 }
49 49
50 UsbServiceAndroid::~UsbServiceAndroid() { 50 UsbServiceAndroid::~UsbServiceAndroid() {
51 JNIEnv* env = AttachCurrentThread(); 51 JNIEnv* env = AttachCurrentThread();
52 Java_ChromeUsbService_close(env, j_object_.obj()); 52 Java_ChromeUsbService_close(env, j_object_);
53 } 53 }
54 54
55 void UsbServiceAndroid::DeviceAttached(JNIEnv* env, 55 void UsbServiceAndroid::DeviceAttached(JNIEnv* env,
56 const JavaRef<jobject>& caller, 56 const JavaRef<jobject>& caller,
57 const JavaRef<jobject>& usb_device) { 57 const JavaRef<jobject>& usb_device) {
58 scoped_refptr<UsbDeviceAndroid> device(UsbDeviceAndroid::Create( 58 scoped_refptr<UsbDeviceAndroid> device(UsbDeviceAndroid::Create(
59 env, weak_factory_.GetWeakPtr(), blocking_task_runner(), usb_device)); 59 env, weak_factory_.GetWeakPtr(), blocking_task_runner(), usb_device));
60 AddDevice(device); 60 AddDevice(device);
61 NotifyDeviceAdded(device); 61 NotifyDeviceAdded(device);
62 } 62 }
(...skipping 22 matching lines...) Expand all
85 jint device_id, 85 jint device_id,
86 jboolean granted) { 86 jboolean granted) {
87 const auto it = devices_by_id_.find(device_id); 87 const auto it = devices_by_id_.find(device_id);
88 DCHECK(it != devices_by_id_.end()); 88 DCHECK(it != devices_by_id_.end());
89 it->second->PermissionGranted(granted); 89 it->second->PermissionGranted(granted);
90 } 90 }
91 91
92 ScopedJavaLocalRef<jobject> UsbServiceAndroid::OpenDevice( 92 ScopedJavaLocalRef<jobject> UsbServiceAndroid::OpenDevice(
93 JNIEnv* env, 93 JNIEnv* env,
94 const JavaRef<jobject>& wrapper) { 94 const JavaRef<jobject>& wrapper) {
95 return Java_ChromeUsbService_openDevice(env, j_object_.obj(), wrapper.obj()); 95 return Java_ChromeUsbService_openDevice(env, j_object_, wrapper);
96 } 96 }
97 97
98 void UsbServiceAndroid::RequestDevicePermission(const JavaRef<jobject>& wrapper, 98 void UsbServiceAndroid::RequestDevicePermission(const JavaRef<jobject>& wrapper,
99 jint device_id) { 99 jint device_id) {
100 Java_ChromeUsbService_requestDevicePermission( 100 Java_ChromeUsbService_requestDevicePermission(AttachCurrentThread(),
101 AttachCurrentThread(), j_object_.obj(), wrapper.obj(), device_id); 101 j_object_, wrapper, device_id);
102 } 102 }
103 103
104 void UsbServiceAndroid::AddDevice(scoped_refptr<UsbDeviceAndroid> device) { 104 void UsbServiceAndroid::AddDevice(scoped_refptr<UsbDeviceAndroid> device) {
105 DCHECK(!ContainsKey(devices_by_id_, device->device_id())); 105 DCHECK(!ContainsKey(devices_by_id_, device->device_id()));
106 DCHECK(!ContainsKey(devices(), device->guid())); 106 DCHECK(!ContainsKey(devices(), device->guid()));
107 devices_by_id_[device->device_id()] = device; 107 devices_by_id_[device->device_id()] = device;
108 devices()[device->guid()] = device; 108 devices()[device->guid()] = device;
109 109
110 USB_LOG(USER) << "USB device added: id=" << device->device_id() 110 USB_LOG(USER) << "USB device added: id=" << device->device_id()
111 << " vendor=" << device->vendor_id() << " \"" 111 << " vendor=" << device->vendor_id() << " \""
112 << device->manufacturer_string() 112 << device->manufacturer_string()
113 << "\", product=" << device->product_id() << " \"" 113 << "\", product=" << device->product_id() << " \""
114 << device->product_string() << "\", serial=\"" 114 << device->product_string() << "\", serial=\""
115 << device->serial_number() << "\", guid=" << device->guid(); 115 << device->serial_number() << "\", guid=" << device->guid();
116 } 116 }
117 117
118 } // namespace device 118 } // namespace device
OLDNEW
« no previous file with comments | « device/usb/usb_interface_android.cc ('k') | device/vr/android/cardboard/cardboard_vr_device.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698