diff options
| author | boliu <boliu@chromium.org> | 2015-03-23 19:22:56 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-24 02:24:04 +0000 |
| commit | 77f844eb1e6df332344f12d385526b011530bfde (patch) | |
| tree | 1c694c60caec6a22f3ebaf6a083d2475438c9535 /android_webview/native | |
| parent | 7135be17e5eecd2eb320b0417799a8d8e57a4305 (diff) | |
| download | chromium_src-77f844eb1e6df332344f12d385526b011530bfde.zip chromium_src-77f844eb1e6df332344f12d385526b011530bfde.tar.gz chromium_src-77f844eb1e6df332344f12d385526b011530bfde.tar.bz2 | |
Convert force video overlay to preference
This is a long lived command line switch that chromecast uses. Convert
it to a RendererPreference instead.
BUG=469343
Review URL: https://codereview.chromium.org/1025933002
Cr-Commit-Position: refs/heads/master@{#321923}
Diffstat (limited to 'android_webview/native')
| -rw-r--r-- | android_webview/native/aw_settings.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/android_webview/native/aw_settings.cc b/android_webview/native/aw_settings.cc index 91c5064..fb5488f 100644 --- a/android_webview/native/aw_settings.cc +++ b/android_webview/native/aw_settings.cc @@ -200,8 +200,13 @@ void AwSettings::UpdateRendererPreferencesLocked(JNIEnv* env, jobject obj) { bool video_overlay = Java_AwSettings_getVideoOverlayForEmbeddedVideoEnabledLocked(env, obj); - if (video_overlay != prefs->use_video_overlay_for_embedded_encrypted_video) { + bool force_video_overlay = + Java_AwSettings_getForceVideoOverlayForTests(env, obj); + if (video_overlay != + prefs->use_video_overlay_for_embedded_encrypted_video || + force_video_overlay != prefs->use_view_overlay_for_all_video) { prefs->use_video_overlay_for_embedded_encrypted_video = video_overlay; + prefs->use_view_overlay_for_all_video = force_video_overlay; update_prefs = true; } |