| 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 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 129 const std::vector<SkBitmap>& bitmaps, | 129 const std::vector<SkBitmap>& bitmaps, |
| 130 const std::vector<gfx::Size>& original_bitmap_sizes) { | 130 const std::vector<gfx::Size>& original_bitmap_sizes) { |
| 131 RemoteMediaPlayerBridge* player = GetRemotePlayer(player_id); | 131 RemoteMediaPlayerBridge* player = GetRemotePlayer(player_id); |
| 132 if (player) | 132 if (player) |
| 133 player->SetPosterBitmap(bitmaps); | 133 player->SetPosterBitmap(bitmaps); |
| 134 } | 134 } |
| 135 | 135 |
| 136 RemoteMediaPlayerBridge* RemoteMediaPlayerManager::CreateRemoteMediaPlayer( | 136 RemoteMediaPlayerBridge* RemoteMediaPlayerManager::CreateRemoteMediaPlayer( |
| 137 int player_id) { | 137 int player_id) { |
| 138 RemoteMediaPlayerBridge* player = | 138 RemoteMediaPlayerBridge* player = |
| 139 new RemoteMediaPlayerBridge(player_id, GetUserAgent(), false, this); | 139 new RemoteMediaPlayerBridge(player_id, GetUserAgent(), this); |
| 140 alternative_players_.push_back(player); | 140 alternative_players_.push_back(player); |
| 141 player->Initialize(); | 141 player->Initialize(); |
| 142 return player; | 142 return player; |
| 143 } | 143 } |
| 144 | 144 |
| 145 bool RemoteMediaPlayerManager::SwapCurrentPlayer(int player_id) { | 145 bool RemoteMediaPlayerManager::SwapCurrentPlayer(int player_id) { |
| 146 // Find the alternative player to swap the current one with. | 146 // Find the alternative player to swap the current one with. |
| 147 auto it = GetAlternativePlayer(player_id); | 147 auto it = GetAlternativePlayer(player_id); |
| 148 if (it == alternative_players_.end()) | 148 if (it == alternative_players_.end()) |
| 149 return false; | 149 return false; |
| (...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 277 MediaPlayerAndroid* local_player = GetLocalPlayer(player_id); | 277 MediaPlayerAndroid* local_player = GetLocalPlayer(player_id); |
| 278 Send(new MediaPlayerMsg_MediaMetadataChanged( | 278 Send(new MediaPlayerMsg_MediaMetadataChanged( |
| 279 RoutingID(), player_id, duration, local_player->GetVideoWidth(), | 279 RoutingID(), player_id, duration, local_player->GetVideoWidth(), |
| 280 local_player->GetVideoHeight(), success)); | 280 local_player->GetVideoHeight(), success)); |
| 281 } else { | 281 } else { |
| 282 BrowserMediaPlayerManager::OnMediaMetadataChanged(player_id, duration, | 282 BrowserMediaPlayerManager::OnMediaMetadataChanged(player_id, duration, |
| 283 width, height, success); | 283 width, height, success); |
| 284 } | 284 } |
| 285 } | 285 } |
| 286 } // namespace remote_media | 286 } // namespace remote_media |
| OLD | NEW |