| Index: content/browser/media/session/media_session_impl.cc
|
| diff --git a/content/browser/media/session/media_session_impl.cc b/content/browser/media/session/media_session_impl.cc
|
| index 7b56e49618c3ff198418fb8706fafdde4b180cdb..022efebc1331af527436b75cc650e019644d8266 100644
|
| --- a/content/browser/media/session/media_session_impl.cc
|
| +++ b/content/browser/media/session/media_session_impl.cc
|
| @@ -6,11 +6,9 @@
|
|
|
| #include "content/browser/media/session/audio_focus_delegate.h"
|
| #include "content/browser/media/session/media_session_player_observer.h"
|
| -#include "content/browser/media/session/media_session_service_impl.h"
|
| #include "content/browser/web_contents/web_contents_impl.h"
|
| -#include "content/public/browser/media_session.h"
|
| -#include "content/public/browser/media_session_observer.h"
|
| #include "content/public/browser/web_contents.h"
|
| +#include "content/public/browser/web_contents_delegate.h"
|
| #include "media/base/media_content_type.h"
|
|
|
| #if defined(OS_ANDROID)
|
| @@ -83,11 +81,6 @@
|
| players_.clear();
|
| pepper_players_.clear();
|
| AbandonSystemAudioFocusIfNeeded();
|
| -}
|
| -
|
| -void MediaSessionImpl::SetMediaSessionService(
|
| - MediaSessionServiceImpl* service) {
|
| - service_ = service;
|
| }
|
|
|
| void MediaSessionImpl::AddObserver(MediaSessionObserver* observer) {
|
| @@ -259,24 +252,6 @@
|
| players_.clear();
|
|
|
| AbandonSystemAudioFocusIfNeeded();
|
| -}
|
| -
|
| -void MediaSessionImpl::DidReceiveAction(
|
| - blink::mojom::MediaSessionAction action) {
|
| - if (service_)
|
| - service_->GetClient()->DidReceiveAction(action);
|
| -}
|
| -
|
| -void MediaSessionImpl::OnMediaSessionEnabledAction(
|
| - blink::mojom::MediaSessionAction action) {
|
| - for (auto& observer : observers_)
|
| - observer.MediaSessionEnabledAction(action);
|
| -}
|
| -
|
| -void MediaSessionImpl::OnMediaSessionDisabledAction(
|
| - blink::mojom::MediaSessionAction action) {
|
| - for (auto& observer : observers_)
|
| - observer.MediaSessionDisabledAction(action);
|
| }
|
|
|
| void MediaSessionImpl::StartDucking() {
|
| @@ -424,8 +399,7 @@
|
| audio_focus_state_(State::INACTIVE),
|
| audio_focus_type_(
|
| AudioFocusManager::AudioFocusType::GainTransientMayDuck),
|
| - is_ducking_(false),
|
| - service_(nullptr) {
|
| + is_ducking_(false) {
|
| #if defined(OS_ANDROID)
|
| session_android_.reset(new MediaSessionAndroid(this));
|
| #endif // defined(OS_ANDROID)
|
|
|