enable subtitle support and the new fullscreen video

content/browser/media/android/browser_media_player_manager.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/media/android/browser_media_player_manager.h"
 
 #include "base/command_line.h"
 #include "content/browser/android/content_view_core_impl.h"
 #include "content/browser/media/android/browser_demuxer_android.h"
 #include "content/browser/media/android/media_resource_getter_impl.h"
@@ skipping 170 matching lines @@
   if (player) {
     // TODO(kbalazs): if |fullscreen_player_is_released_| is true
     // at this point, player->GetCurrentTime() will be wrong until
     // FullscreenPlayerPlay (http://crbug.com/322798).
     OnSeekRequest(fullscreen_player_id_,
                   base::TimeDelta::FromMilliseconds(msec));
   }
 }
 
 void BrowserMediaPlayerManager::ExitFullscreen(bool release_media_player) {
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kEnableOverlayFullscreenVideoSubtitle)) {
+  if (!CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kDisableOverlayFullscreenVideoSubtitle)) {
     if (WebContentsDelegate* delegate = web_contents_->GetDelegate())
       delegate->ToggleFullscreenModeForTab(web_contents_, false);
     if (RenderWidgetHostViewAndroid* view_android =
         static_cast<RenderWidgetHostViewAndroid*>(
             web_contents_->GetRenderWidgetHostView())) {
       view_android->SetOverlayVideoMode(false);
     }
   }
 
   Send(new MediaPlayerMsg_DidExitFullscreen(
@@ skipping 19 matching lines @@
     gfx::ScopedJavaSurface surface) {
   MediaPlayerAndroid* player = GetFullscreenPlayer();
   if (!player)
     return;
   if (!surface.IsEmpty()) {
     Send(new MediaPlayerMsg_DidEnterFullscreen(routing_id(),
                                                player->player_id()));
   }
   player->SetVideoSurface(surface.Pass());
 
-  if (!CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kEnableOverlayFullscreenVideoSubtitle)) {
+  if (CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kDisableOverlayFullscreenVideoSubtitle)) {
     return;
   }
   if (RenderWidgetHostViewAndroid* view_android =
       static_cast<RenderWidgetHostViewAndroid*>(
           web_contents_->GetRenderWidgetHostView())) {
     view_android->SetOverlayVideoMode(true);
   }
   if (WebContentsDelegate* delegate = web_contents_->GetDelegate())
     delegate->ToggleFullscreenModeForTab(web_contents_, true);
 }
@@ skipping 623 matching lines @@
   if (player->IsPlaying())
     OnProtectedSurfaceRequested(cdm_id);
 }
 
 void BrowserMediaPlayerManager::ReleaseFullscreenPlayer(
     MediaPlayerAndroid* player) {
     player->Release();
 }
 
 }  // namespace content