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/browser/aw_settings.h" | 5 #include "android_webview/browser/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/aw_contents.h" | 8 #include "android_webview/browser/aw_contents.h" |
9 #include "android_webview/browser/renderer_host/aw_render_view_host_ext.h" | 9 #include "android_webview/browser/renderer_host/aw_render_view_host_ext.h" |
10 #include "android_webview/common/aw_content_client.h" | 10 #include "android_webview/common/aw_content_client.h" |
(...skipping 366 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
377 Java_AwSettings_getZeroLayoutHeightDisablesViewportQuirkLocked(env, obj); | 377 Java_AwSettings_getZeroLayoutHeightDisablesViewportQuirkLocked(env, obj); |
378 web_prefs->viewport_enabled = !(zero_layout_height_disables_viewport_quirk && | 378 web_prefs->viewport_enabled = !(zero_layout_height_disables_viewport_quirk && |
379 web_prefs->force_zero_layout_height); | 379 web_prefs->force_zero_layout_height); |
380 | 380 |
381 web_prefs->double_tap_to_zoom_enabled = | 381 web_prefs->double_tap_to_zoom_enabled = |
382 Java_AwSettings_supportsDoubleTapZoomLocked(env, obj); | 382 Java_AwSettings_supportsDoubleTapZoomLocked(env, obj); |
383 | 383 |
384 web_prefs->initialize_at_minimum_page_scale = | 384 web_prefs->initialize_at_minimum_page_scale = |
385 Java_AwSettings_getLoadWithOverviewModeLocked(env, obj); | 385 Java_AwSettings_getLoadWithOverviewModeLocked(env, obj); |
386 | 386 |
387 web_prefs->user_gesture_required_for_media_playback = | 387 web_prefs->autoplay_policy = |
388 Java_AwSettings_getMediaPlaybackRequiresUserGestureLocked(env, obj); | 388 Java_AwSettings_getMediaPlaybackRequiresUserGestureLocked(env, obj) |
| 389 ? content::AutoplayPolicy::kUserGestureRequired |
| 390 : content::AutoplayPolicy::kNoUserGestureRequired; |
389 | 391 |
390 ScopedJavaLocalRef<jstring> url = | 392 ScopedJavaLocalRef<jstring> url = |
391 Java_AwSettings_getDefaultVideoPosterURLLocked(env, obj); | 393 Java_AwSettings_getDefaultVideoPosterURLLocked(env, obj); |
392 web_prefs->default_video_poster_url = | 394 web_prefs->default_video_poster_url = |
393 url.obj() ? GURL(ConvertJavaStringToUTF8(url)) : GURL(); | 395 url.obj() ? GURL(ConvertJavaStringToUTF8(url)) : GURL(); |
394 | 396 |
395 bool support_quirks = Java_AwSettings_getSupportLegacyQuirksLocked(env, obj); | 397 bool support_quirks = Java_AwSettings_getSupportLegacyQuirksLocked(env, obj); |
396 // Please see the corresponding Blink settings for bug references. | 398 // Please see the corresponding Blink settings for bug references. |
397 web_prefs->support_deprecated_target_density_dpi = support_quirks; | 399 web_prefs->support_deprecated_target_density_dpi = support_quirks; |
398 web_prefs->use_legacy_background_size_shorthand_behavior = support_quirks; | 400 web_prefs->use_legacy_background_size_shorthand_behavior = support_quirks; |
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
472 JNIEnv* env, | 474 JNIEnv* env, |
473 const JavaParamRef<jclass>& clazz) { | 475 const JavaParamRef<jclass>& clazz) { |
474 return base::android::ConvertUTF8ToJavaString(env, GetUserAgent()); | 476 return base::android::ConvertUTF8ToJavaString(env, GetUserAgent()); |
475 } | 477 } |
476 | 478 |
477 bool RegisterAwSettings(JNIEnv* env) { | 479 bool RegisterAwSettings(JNIEnv* env) { |
478 return RegisterNativesImpl(env); | 480 return RegisterNativesImpl(env); |
479 } | 481 } |
480 | 482 |
481 } // namespace android_webview | 483 } // namespace android_webview |
OLD | NEW |