| Index: base/android/jni_string.h
|
| diff --git a/base/android/jni_string.h b/base/android/jni_string.h
|
| index 89af5b0a89757c16ecbea1322256bfa1387af59b..09e85f306f0c7eae9e3c33445af0cfbf6eadf4cf 100644
|
| --- a/base/android/jni_string.h
|
| +++ b/base/android/jni_string.h
|
| @@ -21,6 +21,8 @@ BASE_EXPORT void ConvertJavaStringToUTF8(JNIEnv* env,
|
| std::string* result);
|
| BASE_EXPORT std::string ConvertJavaStringToUTF8(JNIEnv* env, jstring str);
|
| BASE_EXPORT std::string ConvertJavaStringToUTF8(const JavaRef<jstring>& str);
|
| +BASE_EXPORT std::string ConvertJavaStringToUTF8(JNIEnv* env,
|
| + const JavaRef<jstring>& str);
|
|
|
| // Convert a std string to Java string.
|
| BASE_EXPORT ScopedJavaLocalRef<jstring> ConvertUTF8ToJavaString(
|
| @@ -33,6 +35,8 @@ BASE_EXPORT void ConvertJavaStringToUTF16(JNIEnv* env,
|
| string16* result);
|
| BASE_EXPORT string16 ConvertJavaStringToUTF16(JNIEnv* env, jstring str);
|
| BASE_EXPORT string16 ConvertJavaStringToUTF16(const JavaRef<jstring>& str);
|
| +BASE_EXPORT string16 ConvertJavaStringToUTF16(JNIEnv* env,
|
| + const JavaRef<jstring>& str);
|
|
|
| // Convert a string16 to a Java string.
|
| BASE_EXPORT ScopedJavaLocalRef<jstring> ConvertUTF16ToJavaString(
|
|
|