| 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 "chrome/browser/media/android/remote/remote_media_player_manager.h" | 5 #include "chrome/browser/media/android/remote/remote_media_player_manager.h" |
| 6 | 6 |
| 7 #include "chrome/browser/android/tab_android.h" | 7 #include "chrome/browser/android/tab_android.h" |
| 8 #include "chrome/common/chrome_content_client.h" | 8 #include "chrome/common/chrome_content_client.h" |
| 9 #include "content/common/media/media_player_messages_android.h" | 9 #include "content/common/media/media_player_messages_android.h" |
| 10 #include "third_party/skia/include/core/SkBitmap.h" | 10 #include "third_party/skia/include/core/SkBitmap.h" |
| (...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 196 ReplaceRemotePlayerWithLocal(player_id); | 196 ReplaceRemotePlayerWithLocal(player_id); |
| 197 } | 197 } |
| 198 | 198 |
| 199 void RemoteMediaPlayerManager::OnRouteAvailabilityChanged( | 199 void RemoteMediaPlayerManager::OnRouteAvailabilityChanged( |
| 200 int player_id, bool routes_available) { | 200 int player_id, bool routes_available) { |
| 201 Send( | 201 Send( |
| 202 new MediaPlayerMsg_RemoteRouteAvailabilityChanged(RoutingID(), player_id, | 202 new MediaPlayerMsg_RemoteRouteAvailabilityChanged(RoutingID(), player_id, |
| 203 routes_available)); | 203 routes_available)); |
| 204 } | 204 } |
| 205 | 205 |
| 206 void RemoteMediaPlayerManager::OnCancelledRemotePlaybackRequest(int player_id) { |
| 207 Send(new MediaPlayerMsg_CancelledRemotePlaybackRequest( |
| 208 RoutingID(), player_id)); |
| 209 } |
| 210 |
| 211 |
| 206 void RemoteMediaPlayerManager::ReleaseFullscreenPlayer( | 212 void RemoteMediaPlayerManager::ReleaseFullscreenPlayer( |
| 207 MediaPlayerAndroid* player) { | 213 MediaPlayerAndroid* player) { |
| 208 int player_id = player->player_id(); | 214 int player_id = player->player_id(); |
| 209 // Release the original player's resources, not the current fullscreen player | 215 // Release the original player's resources, not the current fullscreen player |
| 210 // (which is the remote player). | 216 // (which is the remote player). |
| 211 if (IsPlayingRemotely(player_id)) | 217 if (IsPlayingRemotely(player_id)) |
| 212 GetLocalPlayer(player_id)->Release(); | 218 GetLocalPlayer(player_id)->Release(); |
| 213 else | 219 else |
| 214 BrowserMediaPlayerManager::ReleaseFullscreenPlayer(player); | 220 BrowserMediaPlayerManager::ReleaseFullscreenPlayer(player); |
| 215 } | 221 } |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 261 MediaPlayerAndroid* local_player = GetLocalPlayer(player_id); | 267 MediaPlayerAndroid* local_player = GetLocalPlayer(player_id); |
| 262 Send(new MediaPlayerMsg_MediaMetadataChanged( | 268 Send(new MediaPlayerMsg_MediaMetadataChanged( |
| 263 RoutingID(), player_id, duration, local_player->GetVideoWidth(), | 269 RoutingID(), player_id, duration, local_player->GetVideoWidth(), |
| 264 local_player->GetVideoHeight(), success)); | 270 local_player->GetVideoHeight(), success)); |
| 265 } else { | 271 } else { |
| 266 BrowserMediaPlayerManager::OnMediaMetadataChanged(player_id, duration, | 272 BrowserMediaPlayerManager::OnMediaMetadataChanged(player_id, duration, |
| 267 width, height, success); | 273 width, height, success); |
| 268 } | 274 } |
| 269 } | 275 } |
| 270 } // namespace remote_media | 276 } // namespace remote_media |
| OLD | NEW |