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

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

Issue 2252783004: Implement MediaSession (metadata) per frame [NOT READY, HAS DEPENDENCY] (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: minor fixes Created 4 years, 3 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 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 <utility> 7 #include <utility>
8 8
9 #include "base/memory/ptr_util.h" 9 #include "base/memory/ptr_util.h"
10 #include "content/browser/media/android/browser_media_player_manager.h" 10 #include "content/browser/media/android/browser_media_player_manager.h"
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 return manager; 56 return manager;
57 } 57 }
58 58
59 BrowserMediaSessionManager* 59 BrowserMediaSessionManager*
60 MediaWebContentsObserverAndroid::GetMediaSessionManager( 60 MediaWebContentsObserverAndroid::GetMediaSessionManager(
61 RenderFrameHost* render_frame_host) { 61 RenderFrameHost* render_frame_host) {
62 auto it = media_session_managers_.find(render_frame_host); 62 auto it = media_session_managers_.find(render_frame_host);
63 if (it != media_session_managers_.end()) 63 if (it != media_session_managers_.end())
64 return it->second; 64 return it->second;
65 65
66 BrowserMediaSessionManager* manager = 66 BrowserMediaSessionManager* manager = new BrowserMediaSessionManager(
67 new BrowserMediaSessionManager(render_frame_host); 67 render_frame_host, static_cast<WebContentsImpl*>(web_contents()));
68 media_session_managers_.set(render_frame_host, base::WrapUnique(manager)); 68 media_session_managers_.set(render_frame_host, base::WrapUnique(manager));
69 return manager; 69 return manager;
70 } 70 }
71 71
72 BrowserSurfaceViewManager* 72 BrowserSurfaceViewManager*
73 MediaWebContentsObserverAndroid::GetSurfaceViewManager( 73 MediaWebContentsObserverAndroid::GetSurfaceViewManager(
74 RenderFrameHost* render_frame_host) { 74 RenderFrameHost* render_frame_host) {
75 auto it = surface_view_managers_.find(render_frame_host); 75 auto it = surface_view_managers_.find(render_frame_host);
76 if (it != surface_view_managers_.end()) 76 if (it != surface_view_managers_.end())
77 return it->second; 77 return it->second;
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
285 NOTREACHED() << "OnSetCdm: CDM not found for " << cdm_id; 285 NOTREACHED() << "OnSetCdm: CDM not found for " << cdm_id;
286 return; 286 return;
287 } 287 }
288 288
289 // TODO(xhwang): This could possibly fail. In that case we should reject the 289 // TODO(xhwang): This could possibly fail. In that case we should reject the
290 // promise. 290 // promise.
291 media_player->SetCdm(cdm); 291 media_player->SetCdm(cdm);
292 } 292 }
293 293
294 } // namespace content 294 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698