Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(137)

Unified Diff: content/browser/media/android/media_web_contents_observer_android.cc

Issue 2399023002: Make MediaSession available on Desktop (Closed)
Patch Set: merge BrowserMediaSessionManager into MediaSessionServiceImpl, temporarily removing BrowserTests Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/media/android/media_web_contents_observer_android.cc
diff --git a/content/browser/media/android/media_web_contents_observer_android.cc b/content/browser/media/android/media_web_contents_observer_android.cc
index ae785f30fd8fe1c31b4c27e2ba36efe869ec57e1..1ea8d00d5fbd538d146cd1fa99ecee6e59085bfd 100644
--- a/content/browser/media/android/media_web_contents_observer_android.cc
+++ b/content/browser/media/android/media_web_contents_observer_android.cc
@@ -8,7 +8,6 @@
#include "base/memory/ptr_util.h"
#include "content/browser/media/android/browser_media_player_manager.h"
-#include "content/browser/media/android/browser_media_session_manager.h"
#include "content/browser/media/android/browser_surface_view_manager.h"
#include "content/browser/web_contents/web_contents_impl.h"
#include "content/common/media/media_player_delegate_messages.h"
@@ -54,19 +53,6 @@ MediaWebContentsObserverAndroid::GetMediaPlayerManager(
return manager;
}
-BrowserMediaSessionManager*
-MediaWebContentsObserverAndroid::GetMediaSessionManager(
- RenderFrameHost* render_frame_host) {
- auto it = media_session_managers_.find(render_frame_host);
- if (it != media_session_managers_.end())
- return it->second;
-
- BrowserMediaSessionManager* manager =
- new BrowserMediaSessionManager(render_frame_host);
- media_session_managers_.set(render_frame_host, base::WrapUnique(manager));
- return manager;
-}
-
BrowserSurfaceViewManager*
MediaWebContentsObserverAndroid::GetSurfaceViewManager(
RenderFrameHost* render_frame_host) {
@@ -80,12 +66,6 @@ MediaWebContentsObserverAndroid::GetSurfaceViewManager(
return manager;
}
-void MediaWebContentsObserverAndroid::SetMediaSessionManagerForTest(
- RenderFrameHost* render_frame_host,
- std::unique_ptr<BrowserMediaSessionManager> manager) {
- media_session_managers_.set(render_frame_host, std::move(manager));
-}
-
void MediaWebContentsObserverAndroid::SuspendAllMediaPlayers() {
web_contents()->ForEachFrame(
base::Bind(&SuspendAllMediaPlayersInRenderFrame));
@@ -114,7 +94,6 @@ void MediaWebContentsObserverAndroid::RenderFrameDeleted(
MediaWebContentsObserver::RenderFrameDeleted(render_frame_host);
media_player_managers_.erase(render_frame_host);
- media_session_managers_.erase(render_frame_host);
surface_view_managers_.erase(render_frame_host);
}

Powered by Google App Engine
This is Rietveld 408576698