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

Unified Diff: android_webview/native/aw_settings.cc

Issue 1308363003: Revert of jni_generator: Make all object-returning natives return ScopedJavaLocalRef. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « android_webview/native/aw_contents_statics.cc ('k') | android_webview/native/cookie_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: android_webview/native/aw_settings.cc
diff --git a/android_webview/native/aw_settings.cc b/android_webview/native/aw_settings.cc
index a5ae993bc71502b1c1baba606e3a3b09c0f2a18d..c0674f511b00f3369a5f0a27772abafbff89382d 100644
--- a/android_webview/native/aw_settings.cc
+++ b/android_webview/native/aw_settings.cc
@@ -429,9 +429,8 @@
return reinterpret_cast<intptr_t>(settings);
}
-static ScopedJavaLocalRef<jstring> GetDefaultUserAgent(JNIEnv* env,
- jclass clazz) {
- return base::android::ConvertUTF8ToJavaString(env, GetUserAgent());
+static jstring GetDefaultUserAgent(JNIEnv* env, jclass clazz) {
+ return base::android::ConvertUTF8ToJavaString(env, GetUserAgent()).Release();
}
bool RegisterAwSettings(JNIEnv* env) {
« no previous file with comments | « android_webview/native/aw_contents_statics.cc ('k') | android_webview/native/cookie_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698