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

Unified Diff: base/android/jni_array.cc

Issue 10536066: android content shell bringup. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sync and merge Created 8 years, 6 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
« no previous file with comments | « base/android/jni_array.h ('k') | base/android/jni_generator/jni_generator.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/android/jni_array.cc
diff --git a/base/android/jni_array.cc b/base/android/jni_array.cc
index b287b460353c4f08cdae2d1540b7a1b3571b4586..d70151f275b3d4ea63513f16d754845fb26455ab 100644
--- a/base/android/jni_array.cc
+++ b/base/android/jni_array.cc
@@ -67,15 +67,15 @@ ScopedJavaLocalRef<jobjectArray> ToJavaArrayOfStrings(
}
void AppendJavaStringArrayToStringVector(JNIEnv* env,
- const JavaRef<jobjectArray>& array,
+ jobjectArray array,
std::vector<string16>* out) {
DCHECK(out);
- if (array.is_null())
+ if (!array)
return;
- jsize len = env->GetArrayLength(array.obj());
+ jsize len = env->GetArrayLength(array);
for (jsize i = 0; i < len; ++i) {
ScopedJavaLocalRef<jstring> str(env,
- static_cast<jstring>(env->GetObjectArrayElement(array.obj(), i)));
+ static_cast<jstring>(env->GetObjectArrayElement(array, i)));
out->push_back(ConvertJavaStringToUTF16(str));
}
}
« no previous file with comments | « base/android/jni_array.h ('k') | base/android/jni_generator/jni_generator.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698