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

Unified Diff: content/browser/android/content_video_view.cc

Issue 25040002: Enables fullscreen subtitle and media control from Blink (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@build_hack
Patch Set: rebased, +option flag Created 7 years 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/android/content_video_view.cc
diff --git a/content/browser/android/content_video_view.cc b/content/browser/android/content_video_view.cc
index 116e7b4d5981785cdfb1d39937ea652643bad0dd..f943bffb83be0a9ac06ee6d898d999dda2a5bba1 100644
--- a/content/browser/android/content_video_view.cc
+++ b/content/browser/android/content_video_view.cc
@@ -46,9 +46,16 @@ ContentVideoView::ContentVideoView(
: manager_(manager) {
DCHECK(!g_content_video_view);
JNIEnv *env = AttachCurrentThread();
- j_content_video_view_ = JavaObjectWeakGlobalRef(env,
- Java_ContentVideoView_createContentVideoView(env, context.obj(),
- reinterpret_cast<intptr_t>(this), client.obj()).obj());
+ if (CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kEnableOverlayFullscreenVideoSubtitle)) {
+ j_content_video_view_ = JavaObjectWeakGlobalRef(env,
+ Java_ContentVideoView_createContentVideoView(env, context.obj(),
+ reinterpret_cast<intptr_t>(this), client.obj()).obj());
+ } else {
+ j_content_video_view_ = JavaObjectWeakGlobalRef(env,
+ Java_ContentVideoView_createContentVideoViewLegacy(env, context.obj(),
+ reinterpret_cast<intptr_t>(this), client.obj()).obj());
+ }
g_content_video_view = this;
}

Powered by Google App Engine
This is Rietveld 408576698