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/native/aw_contents.h" | 8 #include "android_webview/native/aw_contents.h" |
9 #include "base/android/jni_android.h" | 9 #include "base/android/jni_android.h" |
10 #include "base/android/jni_string.h" | 10 #include "base/android/jni_string.h" |
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
196 Java_AwSettings_getLoadWithOverviewModeLocked(env, obj); | 196 Java_AwSettings_getLoadWithOverviewModeLocked(env, obj); |
197 | 197 |
198 prefs.user_gesture_required_for_media_playback = | 198 prefs.user_gesture_required_for_media_playback = |
199 Java_AwSettings_getMediaPlaybackRequiresUserGestureLocked(env, obj); | 199 Java_AwSettings_getMediaPlaybackRequiresUserGestureLocked(env, obj); |
200 | 200 |
201 ScopedJavaLocalRef<jstring> url = | 201 ScopedJavaLocalRef<jstring> url = |
202 Java_AwSettings_getDefaultVideoPosterURLLocked(env, obj); | 202 Java_AwSettings_getDefaultVideoPosterURLLocked(env, obj); |
203 prefs.default_video_poster_url = url.obj() ? | 203 prefs.default_video_poster_url = url.obj() ? |
204 GURL(ConvertJavaStringToUTF8(url)) : GURL(); | 204 GURL(ConvertJavaStringToUTF8(url)) : GURL(); |
205 | 205 |
206 prefs.support_deprecated_target_density_dpi = | 206 bool support_quirks = Java_AwSettings_getSupportLegacyQuirksLocked(env, obj); |
207 Java_AwSettings_getSupportDeprecatedTargetDensityDPILocked(env, obj); | 207 prefs.support_deprecated_target_density_dpi = support_quirks; |
| 208 prefs.use_legacy_background_size_shorthand_behavior = support_quirks; |
208 | 209 |
209 prefs.password_echo_enabled = | 210 prefs.password_echo_enabled = |
210 Java_AwSettings_getPasswordEchoEnabled(env, obj); | 211 Java_AwSettings_getPasswordEchoEnabled(env, obj); |
211 | 212 |
212 render_view_host->UpdateWebkitPreferences(prefs); | 213 render_view_host->UpdateWebkitPreferences(prefs); |
213 } | 214 } |
214 | 215 |
215 void AwSettings::UpdateInitialPageScaleLocked(JNIEnv* env, jobject obj) { | 216 void AwSettings::UpdateInitialPageScaleLocked(JNIEnv* env, jobject obj) { |
216 AwRenderViewHostExt* rvhe = GetAwRenderViewHostExt(); | 217 AwRenderViewHostExt* rvhe = GetAwRenderViewHostExt(); |
217 if (!rvhe) return; | 218 if (!rvhe) return; |
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
270 static jstring GetDefaultUserAgent(JNIEnv* env, jclass clazz) { | 271 static jstring GetDefaultUserAgent(JNIEnv* env, jclass clazz) { |
271 return base::android::ConvertUTF8ToJavaString( | 272 return base::android::ConvertUTF8ToJavaString( |
272 env, content::GetUserAgent(GURL())).Release(); | 273 env, content::GetUserAgent(GURL())).Release(); |
273 } | 274 } |
274 | 275 |
275 bool RegisterAwSettings(JNIEnv* env) { | 276 bool RegisterAwSettings(JNIEnv* env) { |
276 return RegisterNativesImpl(env) >= 0; | 277 return RegisterNativesImpl(env) >= 0; |
277 } | 278 } |
278 | 279 |
279 } // namespace android_webview | 280 } // namespace android_webview |
OLD | NEW |