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

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

Issue 1842763003: Revert of Remove secondary player from Media Sessions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2661
Patch Set: Created 4 years, 8 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/android/media_session.h" 10 #include "content/browser/media/android/media_session.h"
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 bool has_audio, 93 bool has_audio,
94 bool is_remote, 94 bool is_remote,
95 base::TimeDelta duration) { 95 base::TimeDelta duration) {
96 // |has_video| forced to true since the value doesn't matter at present. 96 // |has_video| forced to true since the value doesn't matter at present.
97 OnMediaPlaying(render_frame_host, delegate_id, true, has_audio, is_remote, 97 OnMediaPlaying(render_frame_host, delegate_id, true, has_audio, is_remote,
98 duration); 98 duration);
99 return media_session_map_.find(MediaPlayerId( 99 return media_session_map_.find(MediaPlayerId(
100 render_frame_host, delegate_id)) != media_session_map_.end(); 100 render_frame_host, delegate_id)) != media_session_map_.end();
101 } 101 }
102 102
103 void MediaWebContentsObserverAndroid::DisconnectMediaSession(
104 RenderFrameHost* render_frame_host,
105 int delegate_id) {
106 session_controllers_manager()->OnEnd(
107 MediaPlayerId(render_frame_host, delegate_id));
108 }
109
110 #if defined(VIDEO_HOLE) 103 #if defined(VIDEO_HOLE)
111 void MediaWebContentsObserverAndroid::OnFrameInfoUpdated() { 104 void MediaWebContentsObserverAndroid::OnFrameInfoUpdated() {
112 for (auto it = media_player_managers_.begin(); 105 for (auto it = media_player_managers_.begin();
113 it != media_player_managers_.end(); ++it) { 106 it != media_player_managers_.end(); ++it) {
114 it->second->OnFrameInfoUpdated(); 107 it->second->OnFrameInfoUpdated();
115 } 108 }
116 } 109 }
117 #endif // defined(VIDEO_HOLE) 110 #endif // defined(VIDEO_HOLE)
118 111
119 void MediaWebContentsObserverAndroid::RenderFrameDeleted( 112 void MediaWebContentsObserverAndroid::RenderFrameDeleted(
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
360 scoped_ptr<MediaSessionController> controller( 353 scoped_ptr<MediaSessionController> controller(
361 new MediaSessionController(id, this)); 354 new MediaSessionController(id, this));
362 355
363 if (!controller->Initialize(has_audio, is_remote, duration)) 356 if (!controller->Initialize(has_audio, is_remote, duration))
364 return; 357 return;
365 358
366 media_session_map_[id] = std::move(controller); 359 media_session_map_[id] = std::move(controller);
367 } 360 }
368 361
369 } // namespace content 362 } // 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