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

Side by Side Diff: base/android/jni_generator/testNatives.golden

Issue 1288183004: jni_generator: Make all object-returning natives return ScopedJavaLocalRef. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add some newlines for readability Created 5 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 // This file is autogenerated by 5 // This file is autogenerated by
6 // base/android/jni_generator/jni_generator.py 6 // base/android/jni_generator/jni_generator.py
7 // For 7 // For
8 // org/chromium/TestJni 8 // org/chromium/TestJni
9 9
10 #ifndef org_chromium_TestJni_JNI 10 #ifndef org_chromium_TestJni_JNI
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 jstring url, 48 jstring url,
49 jstring title, 49 jstring title,
50 jboolean isFolder, 50 jboolean isFolder,
51 jlong parentId) { 51 jlong parentId) {
52 ChromeBrowserProvider* native = 52 ChromeBrowserProvider* native =
53 reinterpret_cast<ChromeBrowserProvider*>(nativeChromeBrowserProvider); 53 reinterpret_cast<ChromeBrowserProvider*>(nativeChromeBrowserProvider);
54 CHECK_NATIVE_PTR(env, jcaller, native, "AddBookmark", 0); 54 CHECK_NATIVE_PTR(env, jcaller, native, "AddBookmark", 0);
55 return native->AddBookmark(env, jcaller, url, title, isFolder, parentId); 55 return native->AddBookmark(env, jcaller, url, title, isFolder, parentId);
56 } 56 }
57 57
58 static jstring GetDomainAndRegistry(JNIEnv* env, jclass jcaller, 58 static ScopedJavaLocalRef<jstring> GetDomainAndRegistry(JNIEnv* env, jclass
59 jcaller,
59 jstring url); 60 jstring url);
60 61
61 static jstring Java_org_chromium_TestJni_nativeGetDomainAndRegistry(JNIEnv* env, 62 static jstring Java_org_chromium_TestJni_nativeGetDomainAndRegistry(JNIEnv* env,
62 jclass jcaller, 63 jclass jcaller,
63 jstring url) { 64 jstring url) {
64 return GetDomainAndRegistry(env, jcaller, url); 65 return GetDomainAndRegistry(env, jcaller, url).Release();
65 } 66 }
66 67
67 static void CreateHistoricalTabFromState(JNIEnv* env, jclass jcaller, 68 static void CreateHistoricalTabFromState(JNIEnv* env, jclass jcaller,
68 jbyteArray state, 69 jbyteArray state,
69 jint tab_index); 70 jint tab_index);
70 71
71 static void Java_org_chromium_TestJni_nativeCreateHistoricalTabFromState(JNIEnv* 72 static void Java_org_chromium_TestJni_nativeCreateHistoricalTabFromState(JNIEnv*
72 env, jclass jcaller, 73 env, jclass jcaller,
73 jbyteArray state, 74 jbyteArray state,
74 jint tab_index) { 75 jint tab_index) {
75 return CreateHistoricalTabFromState(env, jcaller, state, tab_index); 76 return CreateHistoricalTabFromState(env, jcaller, state, tab_index);
76 } 77 }
77 78
78 static jbyteArray GetStateAsByteArray(JNIEnv* env, jobject jcaller, 79 static ScopedJavaLocalRef<jbyteArray> GetStateAsByteArray(JNIEnv* env, jobject
80 jcaller,
79 jobject view); 81 jobject view);
80 82
81 static jbyteArray Java_org_chromium_TestJni_nativeGetStateAsByteArray(JNIEnv* 83 static jbyteArray Java_org_chromium_TestJni_nativeGetStateAsByteArray(JNIEnv*
82 env, jobject jcaller, 84 env, jobject jcaller,
83 jobject view) { 85 jobject view) {
84 return GetStateAsByteArray(env, jcaller, view); 86 return GetStateAsByteArray(env, jcaller, view).Release();
85 } 87 }
86 88
87 static jobjectArray GetAutofillProfileGUIDs(JNIEnv* env, jclass jcaller); 89 static ScopedJavaLocalRef<jobjectArray> GetAutofillProfileGUIDs(JNIEnv* env,
90 jclass jcaller);
88 91
89 static jobjectArray 92 static jobjectArray
90 Java_org_chromium_TestJni_nativeGetAutofillProfileGUIDs(JNIEnv* env, jclass 93 Java_org_chromium_TestJni_nativeGetAutofillProfileGUIDs(JNIEnv* env, jclass
91 jcaller) { 94 jcaller) {
92 return GetAutofillProfileGUIDs(env, jcaller); 95 return GetAutofillProfileGUIDs(env, jcaller).Release();
93 } 96 }
94 97
95 static void SetRecognitionResults(JNIEnv* env, jobject jcaller, 98 static void SetRecognitionResults(JNIEnv* env, jobject jcaller,
96 jint sessionId, 99 jint sessionId,
97 jobjectArray results); 100 jobjectArray results);
98 101
99 static void Java_org_chromium_TestJni_nativeSetRecognitionResults(JNIEnv* env, 102 static void Java_org_chromium_TestJni_nativeSetRecognitionResults(JNIEnv* env,
100 jobject jcaller, 103 jobject jcaller,
101 jint sessionId, 104 jint sessionId,
102 jobjectArray results) { 105 jobjectArray results) {
(...skipping 19 matching lines...) Expand all
122 125
123 static jint FindAll(JNIEnv* env, jobject jcaller, 126 static jint FindAll(JNIEnv* env, jobject jcaller,
124 jstring find); 127 jstring find);
125 128
126 static jint Java_org_chromium_TestJni_nativeFindAll(JNIEnv* env, jobject 129 static jint Java_org_chromium_TestJni_nativeFindAll(JNIEnv* env, jobject
127 jcaller, 130 jcaller,
128 jstring find) { 131 jstring find) {
129 return FindAll(env, jcaller, find); 132 return FindAll(env, jcaller, find);
130 } 133 }
131 134
132 static jobject GetInnerClass(JNIEnv* env, jclass jcaller); 135 static ScopedJavaLocalRef<jobject> GetInnerClass(JNIEnv* env, jclass jcaller);
133 136
134 static jobject Java_org_chromium_TestJni_nativeGetInnerClass(JNIEnv* env, jclass 137 static jobject Java_org_chromium_TestJni_nativeGetInnerClass(JNIEnv* env, jclass
135 jcaller) { 138 jcaller) {
136 return GetInnerClass(env, jcaller); 139 return GetInnerClass(env, jcaller).Release();
137 } 140 }
138 141
139 static jobject Java_org_chromium_TestJni_nativeQueryBitmap(JNIEnv* env, 142 static jobject Java_org_chromium_TestJni_nativeQueryBitmap(JNIEnv* env,
140 jobject jcaller, 143 jobject jcaller,
141 jint nativeChromeBrowserProvider, 144 jint nativeChromeBrowserProvider,
142 jobjectArray projection, 145 jobjectArray projection,
143 jstring selection, 146 jstring selection,
144 jobjectArray selectionArgs, 147 jobjectArray selectionArgs,
145 jstring sortOrder) { 148 jstring sortOrder) {
146 ChromeBrowserProvider* native = 149 ChromeBrowserProvider* native =
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
274 kMethodsTestJniSize) < 0) { 277 kMethodsTestJniSize) < 0) {
275 jni_generator::HandleRegistrationError( 278 jni_generator::HandleRegistrationError(
276 env, TestJni_clazz(env), __FILE__); 279 env, TestJni_clazz(env), __FILE__);
277 return false; 280 return false;
278 } 281 }
279 282
280 return true; 283 return true;
281 } 284 }
282 285
283 #endif // org_chromium_TestJni_JNI 286 #endif // org_chromium_TestJni_JNI
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698