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

Side by Side Diff: content/browser/media/android/media_web_contents_observer_android.cc

Issue 1823983002: Remove secondary player from Media Sessions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix accidental formatting changes Created 4 years, 9 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
« no previous file with comments | « content/browser/media/android/media_web_contents_observer_android.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/media_web_contents_observer_android.h" 5 #include "content/browser/media/android/media_web_contents_observer_android.h"
6 6
7 #include "content/browser/media/android/browser_media_player_manager.h" 7 #include "content/browser/media/android/browser_media_player_manager.h"
8 #include "content/browser/media/android/browser_media_session_manager.h" 8 #include "content/browser/media/android/browser_media_session_manager.h"
9 #include "content/browser/media/android/browser_surface_view_manager.h" 9 #include "content/browser/media/android/browser_surface_view_manager.h"
10 #include "content/browser/media/cdm/browser_cdm_manager.h" 10 #include "content/browser/media/cdm/browser_cdm_manager.h"
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 RenderFrameHost* render_frame_host, 88 RenderFrameHost* render_frame_host,
89 int delegate_id, 89 int delegate_id,
90 bool has_audio, 90 bool has_audio,
91 bool is_remote, 91 bool is_remote,
92 base::TimeDelta duration) { 92 base::TimeDelta duration) {
93 return session_controllers_manager()->RequestPlay( 93 return session_controllers_manager()->RequestPlay(
94 MediaPlayerId(render_frame_host, delegate_id), 94 MediaPlayerId(render_frame_host, delegate_id),
95 has_audio, is_remote, duration); 95 has_audio, is_remote, duration);
96 } 96 }
97 97
98 void MediaWebContentsObserverAndroid::DisconnectMediaSession(
99 RenderFrameHost* render_frame_host,
100 int delegate_id) {
101 session_controllers_manager()->OnEnd(
102 MediaPlayerId(render_frame_host, delegate_id));
103 }
104
98 #if defined(VIDEO_HOLE) 105 #if defined(VIDEO_HOLE)
99 void MediaWebContentsObserverAndroid::OnFrameInfoUpdated() { 106 void MediaWebContentsObserverAndroid::OnFrameInfoUpdated() {
100 for (auto it = media_player_managers_.begin(); 107 for (auto it = media_player_managers_.begin();
101 it != media_player_managers_.end(); ++it) { 108 it != media_player_managers_.end(); ++it) {
102 it->second->OnFrameInfoUpdated(); 109 it->second->OnFrameInfoUpdated();
103 } 110 }
104 } 111 }
105 #endif // defined(VIDEO_HOLE) 112 #endif // defined(VIDEO_HOLE)
106 113
107 void MediaWebContentsObserverAndroid::RenderFrameDeleted( 114 void MediaWebContentsObserverAndroid::RenderFrameDeleted(
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
269 NOTREACHED() << "OnSetCdm: CDM not found for " << cdm_id; 276 NOTREACHED() << "OnSetCdm: CDM not found for " << cdm_id;
270 return; 277 return;
271 } 278 }
272 279
273 // TODO(xhwang): This could possibly fail. In that case we should reject the 280 // TODO(xhwang): This could possibly fail. In that case we should reject the
274 // promise. 281 // promise.
275 media_player->SetCdm(cdm); 282 media_player->SetCdm(cdm);
276 } 283 }
277 284
278 } // namespace content 285 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/media/android/media_web_contents_observer_android.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698