Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(708)

Side by Side Diff: android_webview/native/aw_settings.cc

Issue 2299883007: Remove video overlay support from WebView (Closed)
Patch Set: Removed another external_video_surface reference Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « android_webview/native/DEPS ('k') | android_webview/test/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 205
206 bool update_prefs = false; 206 bool update_prefs = false;
207 RendererPreferences* prefs = web_contents()->GetMutableRendererPrefs(); 207 RendererPreferences* prefs = web_contents()->GetMutableRendererPrefs();
208 208
209 if (!renderer_prefs_initialized_) { 209 if (!renderer_prefs_initialized_) {
210 PopulateFixedRendererPreferences(prefs); 210 PopulateFixedRendererPreferences(prefs);
211 renderer_prefs_initialized_ = true; 211 renderer_prefs_initialized_ = true;
212 update_prefs = true; 212 update_prefs = true;
213 } 213 }
214 214
215 bool video_overlay =
216 Java_AwSettings_getVideoOverlayForEmbeddedVideoEnabledLocked(env, obj);
217 bool force_video_overlay =
218 Java_AwSettings_getForceVideoOverlayForTests(env, obj);
219 if (video_overlay !=
220 prefs->use_video_overlay_for_embedded_encrypted_video ||
221 force_video_overlay != prefs->use_view_overlay_for_all_video) {
222 prefs->use_video_overlay_for_embedded_encrypted_video = video_overlay;
223 prefs->use_view_overlay_for_all_video = force_video_overlay;
224 update_prefs = true;
225 }
226
227 if (prefs->accept_languages.compare( 215 if (prefs->accept_languages.compare(
228 AwContentBrowserClient::GetAcceptLangsImpl())) { 216 AwContentBrowserClient::GetAcceptLangsImpl())) {
229 prefs->accept_languages = AwContentBrowserClient::GetAcceptLangsImpl(); 217 prefs->accept_languages = AwContentBrowserClient::GetAcceptLangsImpl();
230 update_prefs = true; 218 update_prefs = true;
231 } 219 }
232 220
233 content::RenderViewHost* host = web_contents()->GetRenderViewHost(); 221 content::RenderViewHost* host = web_contents()->GetRenderViewHost();
234 if (update_prefs && host) 222 if (update_prefs && host)
235 host->SyncRendererPrefs(); 223 host->SyncRendererPrefs();
236 } 224 }
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
458 JNIEnv* env, 446 JNIEnv* env,
459 const JavaParamRef<jclass>& clazz) { 447 const JavaParamRef<jclass>& clazz) {
460 return base::android::ConvertUTF8ToJavaString(env, GetUserAgent()); 448 return base::android::ConvertUTF8ToJavaString(env, GetUserAgent());
461 } 449 }
462 450
463 bool RegisterAwSettings(JNIEnv* env) { 451 bool RegisterAwSettings(JNIEnv* env) {
464 return RegisterNativesImpl(env); 452 return RegisterNativesImpl(env);
465 } 453 }
466 454
467 } // namespace android_webview 455 } // namespace android_webview
OLDNEW
« no previous file with comments | « android_webview/native/DEPS ('k') | android_webview/test/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698