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

Side by Side Diff: content/browser/media/media_web_contents_observer.cc

Issue 2399023002: Make MediaSession available on Desktop (Closed)
Patch Set: rebased 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/media_web_contents_observer.h" 5 #include "content/browser/media/media_web_contents_observer.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "base/lazy_instance.h" 9 #include "base/lazy_instance.h"
10 #include "build/build_config.h" 10 #include "build/build_config.h"
11 #include "content/browser/media/audible_metrics.h" 11 #include "content/browser/media/audible_metrics.h"
12 #include "content/browser/media/audio_stream_monitor.h" 12 #include "content/browser/media/audio_stream_monitor.h"
13 #include "content/browser/media/session/browser_media_session_manager.h"
13 #include "content/browser/web_contents/web_contents_impl.h" 14 #include "content/browser/web_contents/web_contents_impl.h"
14 #include "content/common/media/media_player_delegate_messages.h" 15 #include "content/common/media/media_player_delegate_messages.h"
15 #include "content/public/browser/render_frame_host.h" 16 #include "content/public/browser/render_frame_host.h"
16 #include "content/public/browser/web_contents.h" 17 #include "content/public/browser/web_contents.h"
17 #include "device/power_save_blocker/power_save_blocker.h" 18 #include "device/power_save_blocker/power_save_blocker.h"
18 #include "ipc/ipc_message_macros.h" 19 #include "ipc/ipc_message_macros.h"
19 20
20 namespace content { 21 namespace content {
21 22
22 namespace { 23 namespace {
23 24
24 static base::LazyInstance<AudibleMetrics>::Leaky g_audible_metrics = 25 static base::LazyInstance<AudibleMetrics>::Leaky g_audible_metrics =
25 LAZY_INSTANCE_INITIALIZER; 26 LAZY_INSTANCE_INITIALIZER;
26 27
27 } // anonymous namespace 28 } // anonymous namespace
28 29
29 MediaWebContentsObserver::MediaWebContentsObserver(WebContents* web_contents) 30 MediaWebContentsObserver::MediaWebContentsObserver(WebContents* web_contents)
30 : WebContentsObserver(web_contents), 31 : WebContentsObserver(web_contents),
31 session_controllers_manager_(this) {} 32 session_controllers_manager_(this) {}
32 33
33 MediaWebContentsObserver::~MediaWebContentsObserver() {} 34 MediaWebContentsObserver::~MediaWebContentsObserver() {}
34 35
36 BrowserMediaSessionManager*
37 MediaWebContentsObserver::GetMediaSessionManager(
38 RenderFrameHost* render_frame_host) {
39 auto it = media_session_managers_.find(render_frame_host);
40 if (it != media_session_managers_.end())
41 return it->second;
42
43 BrowserMediaSessionManager* manager =
44 new BrowserMediaSessionManager(render_frame_host);
45 media_session_managers_.set(render_frame_host, base::WrapUnique(manager));
46 return manager;
47 }
48
49 void MediaWebContentsObserver::SetMediaSessionManagerForTest(
50 RenderFrameHost* render_frame_host,
51 std::unique_ptr<BrowserMediaSessionManager> manager) {
52 media_session_managers_.set(render_frame_host, std::move(manager));
53 }
54
35 void MediaWebContentsObserver::WebContentsDestroyed() { 55 void MediaWebContentsObserver::WebContentsDestroyed() {
36 g_audible_metrics.Get().UpdateAudibleWebContentsState(web_contents(), false); 56 g_audible_metrics.Get().UpdateAudibleWebContentsState(web_contents(), false);
37 } 57 }
38 58
39 void MediaWebContentsObserver::RenderFrameDeleted( 59 void MediaWebContentsObserver::RenderFrameDeleted(
40 RenderFrameHost* render_frame_host) { 60 RenderFrameHost* render_frame_host) {
41 ClearPowerSaveBlockers(render_frame_host); 61 ClearPowerSaveBlockers(render_frame_host);
42 session_controllers_manager_.RenderFrameDeleted(render_frame_host); 62 session_controllers_manager_.RenderFrameDeleted(render_frame_host);
63 media_session_managers_.erase(render_frame_host);
43 } 64 }
44 65
45 void MediaWebContentsObserver::MaybeUpdateAudibleState() { 66 void MediaWebContentsObserver::MaybeUpdateAudibleState() {
46 if (!AudioStreamMonitor::monitoring_available()) 67 if (!AudioStreamMonitor::monitoring_available())
47 return; 68 return;
48 69
49 AudioStreamMonitor* audio_stream_monitor = 70 AudioStreamMonitor* audio_stream_monitor =
50 static_cast<WebContentsImpl*>(web_contents())->audio_stream_monitor(); 71 static_cast<WebContentsImpl*>(web_contents())->audio_stream_monitor();
51 72
52 if (audio_stream_monitor->WasRecentlyAudible()) { 73 if (audio_stream_monitor->WasRecentlyAudible()) {
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 if (it == player_map->end()) 271 if (it == player_map->end())
251 return; 272 return;
252 273
253 for (int delegate_id : it->second) 274 for (int delegate_id : it->second)
254 removed_players->insert(MediaPlayerId(render_frame_host, delegate_id)); 275 removed_players->insert(MediaPlayerId(render_frame_host, delegate_id));
255 276
256 player_map->erase(it); 277 player_map->erase(it);
257 } 278 }
258 279
259 } // namespace content 280 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698