OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "android_webview/native/aw_settings.h" | 5 #include "android_webview/native/aw_settings.h" |
6 | 6 |
7 #include "android_webview/browser/renderer_host/aw_render_view_host_ext.h" | 7 #include "android_webview/browser/renderer_host/aw_render_view_host_ext.h" |
8 #include "android_webview/common/aw_content_client.h" | 8 #include "android_webview/common/aw_content_client.h" |
9 #include "android_webview/native/aw_contents.h" | 9 #include "android_webview/native/aw_contents.h" |
10 #include "base/android/jni_android.h" | 10 #include "base/android/jni_android.h" |
(...skipping 411 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
422 | 422 |
423 static jlong Init(JNIEnv* env, | 423 static jlong Init(JNIEnv* env, |
424 jobject obj, | 424 jobject obj, |
425 jobject web_contents) { | 425 jobject web_contents) { |
426 content::WebContents* contents = content::WebContents::FromJavaWebContents( | 426 content::WebContents* contents = content::WebContents::FromJavaWebContents( |
427 web_contents); | 427 web_contents); |
428 AwSettings* settings = new AwSettings(env, obj, contents); | 428 AwSettings* settings = new AwSettings(env, obj, contents); |
429 return reinterpret_cast<intptr_t>(settings); | 429 return reinterpret_cast<intptr_t>(settings); |
430 } | 430 } |
431 | 431 |
432 static jstring GetDefaultUserAgent(JNIEnv* env, jclass clazz) { | 432 static ScopedJavaLocalRef<jstring> GetDefaultUserAgent(JNIEnv* env, |
433 return base::android::ConvertUTF8ToJavaString(env, GetUserAgent()).Release(); | 433 jclass clazz) { |
| 434 return base::android::ConvertUTF8ToJavaString(env, GetUserAgent()); |
434 } | 435 } |
435 | 436 |
436 bool RegisterAwSettings(JNIEnv* env) { | 437 bool RegisterAwSettings(JNIEnv* env) { |
437 return RegisterNativesImpl(env); | 438 return RegisterNativesImpl(env); |
438 } | 439 } |
439 | 440 |
440 } // namespace android_webview | 441 } // namespace android_webview |
OLD | NEW |