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/aw_content_browser_client.h" | 7 #include "android_webview/browser/aw_content_browser_client.h" |
8 #include "android_webview/browser/renderer_host/aw_render_view_host_ext.h" | 8 #include "android_webview/browser/renderer_host/aw_render_view_host_ext.h" |
9 #include "android_webview/common/aw_content_client.h" | 9 #include "android_webview/common/aw_content_client.h" |
10 #include "android_webview/native/aw_contents.h" | 10 #include "android_webview/native/aw_contents.h" |
(...skipping 415 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
426 | 426 |
427 web_prefs->allow_displaying_insecure_content = | 427 web_prefs->allow_displaying_insecure_content = |
428 Java_AwSettings_getAllowDisplayingInsecureContentLocked(env, obj); | 428 Java_AwSettings_getAllowDisplayingInsecureContentLocked(env, obj); |
429 web_prefs->allow_running_insecure_content = | 429 web_prefs->allow_running_insecure_content = |
430 Java_AwSettings_getAllowRunningInsecureContentLocked(env, obj); | 430 Java_AwSettings_getAllowRunningInsecureContentLocked(env, obj); |
431 | 431 |
432 web_prefs->fullscreen_supported = | 432 web_prefs->fullscreen_supported = |
433 Java_AwSettings_getFullscreenSupportedLocked(env, obj); | 433 Java_AwSettings_getFullscreenSupportedLocked(env, obj); |
434 web_prefs->record_whole_document = | 434 web_prefs->record_whole_document = |
435 Java_AwSettings_getRecordFullDocument(env, obj); | 435 Java_AwSettings_getRecordFullDocument(env, obj); |
| 436 |
| 437 // TODO(jww): This should be removed once sufficient warning has been given of |
| 438 // possible API breakage because of disabling insecure use of geolocation. |
| 439 web_prefs->allow_geolocation_on_insecure_origins = true; |
436 } | 440 } |
437 | 441 |
438 static jlong Init(JNIEnv* env, | 442 static jlong Init(JNIEnv* env, |
439 const JavaParamRef<jobject>& obj, | 443 const JavaParamRef<jobject>& obj, |
440 const JavaParamRef<jobject>& web_contents) { | 444 const JavaParamRef<jobject>& web_contents) { |
441 content::WebContents* contents = content::WebContents::FromJavaWebContents( | 445 content::WebContents* contents = content::WebContents::FromJavaWebContents( |
442 web_contents); | 446 web_contents); |
443 AwSettings* settings = new AwSettings(env, obj, contents); | 447 AwSettings* settings = new AwSettings(env, obj, contents); |
444 return reinterpret_cast<intptr_t>(settings); | 448 return reinterpret_cast<intptr_t>(settings); |
445 } | 449 } |
446 | 450 |
447 static ScopedJavaLocalRef<jstring> GetDefaultUserAgent( | 451 static ScopedJavaLocalRef<jstring> GetDefaultUserAgent( |
448 JNIEnv* env, | 452 JNIEnv* env, |
449 const JavaParamRef<jclass>& clazz) { | 453 const JavaParamRef<jclass>& clazz) { |
450 return base::android::ConvertUTF8ToJavaString(env, GetUserAgent()); | 454 return base::android::ConvertUTF8ToJavaString(env, GetUserAgent()); |
451 } | 455 } |
452 | 456 |
453 bool RegisterAwSettings(JNIEnv* env) { | 457 bool RegisterAwSettings(JNIEnv* env) { |
454 return RegisterNativesImpl(env); | 458 return RegisterNativesImpl(env); |
455 } | 459 } |
456 | 460 |
457 } // namespace android_webview | 461 } // namespace android_webview |
OLD | NEW |