| 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/android/media_players_observer.h" | 10 #include "content/browser/android/media_players_observer.h" |
| (...skipping 549 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 560 player->SeekTo(time); | 560 player->SeekTo(time); |
| 561 } | 561 } |
| 562 | 562 |
| 563 void BrowserMediaPlayerManager::OnPause( | 563 void BrowserMediaPlayerManager::OnPause( |
| 564 int player_id, | 564 int player_id, |
| 565 bool is_media_related_action) { | 565 bool is_media_related_action) { |
| 566 MediaPlayerAndroid* player = GetPlayer(player_id); | 566 MediaPlayerAndroid* player = GetPlayer(player_id); |
| 567 if (player) | 567 if (player) |
| 568 player->Pause(is_media_related_action); | 568 player->Pause(is_media_related_action); |
| 569 | 569 |
| 570 MediaSession::Get(web_contents())->RemovePlayer(this, player_id); | 570 if (is_media_related_action) |
| 571 MediaSession::Get(web_contents())->RemovePlayer(this, player_id); |
| 571 } | 572 } |
| 572 | 573 |
| 573 void BrowserMediaPlayerManager::OnSetVolume(int player_id, double volume) { | 574 void BrowserMediaPlayerManager::OnSetVolume(int player_id, double volume) { |
| 574 MediaPlayerAndroid* player = GetPlayer(player_id); | 575 MediaPlayerAndroid* player = GetPlayer(player_id); |
| 575 if (player) | 576 if (player) |
| 576 player->SetVolume(volume); | 577 player->SetVolume(volume); |
| 577 } | 578 } |
| 578 | 579 |
| 579 void BrowserMediaPlayerManager::OnSetPoster(int player_id, const GURL& url) { | 580 void BrowserMediaPlayerManager::OnSetPoster(int player_id, const GURL& url) { |
| 580 // To be overridden by subclasses. | 581 // To be overridden by subclasses. |
| (...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 685 external_video_surface_container_->ReleaseExternalVideoSurface(player_id); | 686 external_video_surface_container_->ReleaseExternalVideoSurface(player_id); |
| 686 #endif // defined(VIDEO_HOLE) | 687 #endif // defined(VIDEO_HOLE) |
| 687 } | 688 } |
| 688 | 689 |
| 689 void BrowserMediaPlayerManager::ReleasePlayer(MediaPlayerAndroid* player) { | 690 void BrowserMediaPlayerManager::ReleasePlayer(MediaPlayerAndroid* player) { |
| 690 player->Release(); | 691 player->Release(); |
| 691 ReleaseMediaResources(player->player_id()); | 692 ReleaseMediaResources(player->player_id()); |
| 692 } | 693 } |
| 693 | 694 |
| 694 } // namespace content | 695 } // namespace content |
| OLD | NEW |