| Index: base/android/jni_array.h
|
| diff --git a/base/android/jni_array.h b/base/android/jni_array.h
|
| index fea5548fe84ea3498e54c4ce5bc7b9e8ceb90ef5..087eb37e6ce7db5e31e4ecf26897c0a263af8ca2 100644
|
| --- a/base/android/jni_array.h
|
| +++ b/base/android/jni_array.h
|
| @@ -11,6 +11,7 @@
|
|
|
| #include "base/android/scoped_java_ref.h"
|
| #include "base/basictypes.h"
|
| +#include "base/string16.h"
|
|
|
| namespace base {
|
| namespace android {
|
| @@ -26,6 +27,14 @@ ScopedJavaLocalRef<jobjectArray> ToJavaArrayOfByteArray(
|
| ScopedJavaLocalRef<jobjectArray> ToJavaArrayOfStrings(
|
| JNIEnv* env, const std::vector<std::string>& v);
|
|
|
| +ScopedJavaLocalRef<jobjectArray> ToJavaArrayOfStrings(
|
| + JNIEnv* env, const std::vector<string16>& v);
|
| +
|
| +// Converts a Java string array to a native array.
|
| +void AppendJavaStringArrayToStringVector(JNIEnv* env,
|
| + const JavaRef<jobjectArray>& array,
|
| + std::vector<string16>* out);
|
| +
|
| // Appends the Java bytes in |bytes_array| onto the end of |out|.
|
| void AppendJavaByteArrayToByteVector(JNIEnv* env,
|
| jbyteArray byte_array,
|
|
|