OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 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 "content/browser/media/android/browser_media_player_manager.h" | 5 #include "content/browser/media/android/browser_media_player_manager.h" |
6 | 6 |
7 #include "base/android/scoped_java_ref.h" | 7 #include "base/android/scoped_java_ref.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "content/browser/android/content_view_core_impl.h" | 9 #include "content/browser/android/content_view_core_impl.h" |
10 #include "content/browser/media/android/browser_demuxer_android.h" | 10 #include "content/browser/media/android/browser_demuxer_android.h" |
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
163 // TODO(kbalazs): if |fullscreen_player_is_released_| is true | 163 // TODO(kbalazs): if |fullscreen_player_is_released_| is true |
164 // at this point, player->GetCurrentTime() will be wrong until | 164 // at this point, player->GetCurrentTime() will be wrong until |
165 // FullscreenPlayerPlay (http://crbug.com/322798). | 165 // FullscreenPlayerPlay (http://crbug.com/322798). |
166 OnSeekRequest(fullscreen_player_id_, | 166 OnSeekRequest(fullscreen_player_id_, |
167 base::TimeDelta::FromMilliseconds(msec)); | 167 base::TimeDelta::FromMilliseconds(msec)); |
168 } | 168 } |
169 } | 169 } |
170 | 170 |
171 void BrowserMediaPlayerManager::ExitFullscreen(bool release_media_player) { | 171 void BrowserMediaPlayerManager::ExitFullscreen(bool release_media_player) { |
172 if (WebContentsDelegate* delegate = web_contents_->GetDelegate()) | 172 if (WebContentsDelegate* delegate = web_contents_->GetDelegate()) |
173 delegate->ToggleFullscreenModeForTab(web_contents_, false); | 173 delegate->ToggleFullscreenModeForTab(web_contents_, false, true); |
174 if (RenderWidgetHostViewAndroid* view_android = | 174 if (RenderWidgetHostViewAndroid* view_android = |
175 static_cast<RenderWidgetHostViewAndroid*>( | 175 static_cast<RenderWidgetHostViewAndroid*>( |
176 web_contents_->GetRenderWidgetHostView())) { | 176 web_contents_->GetRenderWidgetHostView())) { |
177 view_android->SetOverlayVideoMode(false); | 177 view_android->SetOverlayVideoMode(false); |
178 } | 178 } |
179 | 179 |
180 Send( | 180 Send( |
181 new MediaPlayerMsg_DidExitFullscreen(RoutingID(), fullscreen_player_id_)); | 181 new MediaPlayerMsg_DidExitFullscreen(RoutingID(), fullscreen_player_id_)); |
182 video_view_.reset(); | 182 video_view_.reset(); |
183 MediaPlayerAndroid* player = GetFullscreenPlayer(); | 183 MediaPlayerAndroid* player = GetFullscreenPlayer(); |
(...skipping 414 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
598 external_video_surface_container_->ReleaseExternalVideoSurface(player_id); | 598 external_video_surface_container_->ReleaseExternalVideoSurface(player_id); |
599 #endif // defined(VIDEO_HOLE) | 599 #endif // defined(VIDEO_HOLE) |
600 } | 600 } |
601 | 601 |
602 void BrowserMediaPlayerManager::ReleasePlayer(MediaPlayerAndroid* player) { | 602 void BrowserMediaPlayerManager::ReleasePlayer(MediaPlayerAndroid* player) { |
603 player->Release(); | 603 player->Release(); |
604 ReleaseMediaResources(player->player_id()); | 604 ReleaseMediaResources(player->player_id()); |
605 } | 605 } |
606 | 606 |
607 } // namespace content | 607 } // namespace content |
OLD | NEW |