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

Unified Diff: base/android/jni_array.cc

Issue 903273002: Update from https://crrev.com/315085 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 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 side-by-side diff with in-line comments
Download patch
Index: base/android/jni_array.cc
diff --git a/base/android/jni_array.cc b/base/android/jni_array.cc
index a1573543d09fe75fb7037b9559a56d7df05d4aae..4bebec7beb1de1b625d9c26fd2ceba64c55c59b0 100644
--- a/base/android/jni_array.cc
+++ b/base/android/jni_array.cc
@@ -7,6 +7,7 @@
#include "base/android/jni_android.h"
#include "base/android/jni_string.h"
#include "base/logging.h"
+#include "base/stl_util.h"
namespace base {
namespace android {
@@ -53,7 +54,7 @@ ScopedJavaLocalRef<jintArray> ToJavaIntArray(
ScopedJavaLocalRef<jintArray> ToJavaIntArray(
JNIEnv* env, const std::vector<int>& ints) {
- return ToJavaIntArray(env, ints.begin(), ints.size());
+ return ToJavaIntArray(env, vector_as_array(&ints), ints.size());
}
ScopedJavaLocalRef<jlongArray> ToJavaLongArray(
@@ -72,7 +73,7 @@ ScopedJavaLocalRef<jlongArray> ToJavaLongArray(
// Returns a new Java long array converted from the given int64 array.
BASE_EXPORT ScopedJavaLocalRef<jlongArray> ToJavaLongArray(
JNIEnv* env, const std::vector<int64>& longs) {
- return ToJavaLongArray(env, longs.begin(), longs.size());
+ return ToJavaLongArray(env, vector_as_array(&longs), longs.size());
}
ScopedJavaLocalRef<jobjectArray> ToJavaArrayOfByteArray(
« no previous file with comments | « base/android/java/src/org/chromium/base/library_loader/LibraryLoader.java ('k') | base/android/scoped_java_ref_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698