Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 "base/memory/ptr_util.h" | 7 #include "base/memory/ptr_util.h" |
| 8 #include "content/browser/media/android/browser_media_player_manager.h" | 8 #include "content/browser/media/android/browser_media_player_manager.h" |
| 9 #include "content/browser/media/android/browser_media_session_manager.h" | 9 #include "content/browser/media/android/browser_media_session_manager.h" |
| 10 #include "content/browser/media/android/browser_surface_view_manager.h" | 10 #include "content/browser/media/android/browser_surface_view_manager.h" |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 73 auto it = surface_view_managers_.find(render_frame_host); | 73 auto it = surface_view_managers_.find(render_frame_host); |
| 74 if (it != surface_view_managers_.end()) | 74 if (it != surface_view_managers_.end()) |
| 75 return it->second; | 75 return it->second; |
| 76 | 76 |
| 77 BrowserSurfaceViewManager* manager = | 77 BrowserSurfaceViewManager* manager = |
| 78 new BrowserSurfaceViewManager(render_frame_host); | 78 new BrowserSurfaceViewManager(render_frame_host); |
| 79 surface_view_managers_.set(render_frame_host, base::WrapUnique(manager)); | 79 surface_view_managers_.set(render_frame_host, base::WrapUnique(manager)); |
| 80 return manager; | 80 return manager; |
| 81 } | 81 } |
| 82 | 82 |
| 83 void MediaWebContentsObserverAndroid::SetMediaSessionManagerForTest( | |
| 84 RenderFrameHost* render_frame_host, BrowserMediaSessionManager* manager) { | |
|
dcheng
2016/07/05 02:36:55
Nit: please pass |manager| through as a std::uniqu
Zhiqiang Zhang (Slow)
2016/07/05 15:30:30
Done. Though I think we are putting too much magic
dcheng
2016/07/06 02:34:15
If a pointer param is transferring ownership, it s
| |
| 85 media_session_managers_.set(render_frame_host, base::WrapUnique(manager)); | |
| 86 } | |
| 87 | |
| 83 void MediaWebContentsObserverAndroid::SuspendAllMediaPlayers() { | 88 void MediaWebContentsObserverAndroid::SuspendAllMediaPlayers() { |
| 84 web_contents()->ForEachFrame( | 89 web_contents()->ForEachFrame( |
| 85 base::Bind(&SuspendAllMediaPlayersInRenderFrame)); | 90 base::Bind(&SuspendAllMediaPlayersInRenderFrame)); |
| 86 } | 91 } |
| 87 | 92 |
| 88 bool MediaWebContentsObserverAndroid::RequestPlay( | 93 bool MediaWebContentsObserverAndroid::RequestPlay( |
| 89 RenderFrameHost* render_frame_host, | 94 RenderFrameHost* render_frame_host, |
| 90 int delegate_id, | 95 int delegate_id, |
| 91 bool has_audio, | 96 bool has_audio, |
| 92 bool is_remote, | 97 bool is_remote, |
| (...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 277 NOTREACHED() << "OnSetCdm: CDM not found for " << cdm_id; | 282 NOTREACHED() << "OnSetCdm: CDM not found for " << cdm_id; |
| 278 return; | 283 return; |
| 279 } | 284 } |
| 280 | 285 |
| 281 // TODO(xhwang): This could possibly fail. In that case we should reject the | 286 // TODO(xhwang): This could possibly fail. In that case we should reject the |
| 282 // promise. | 287 // promise. |
| 283 media_player->SetCdm(cdm); | 288 media_player->SetCdm(cdm); |
| 284 } | 289 } |
| 285 | 290 |
| 286 } // namespace content | 291 } // namespace content |
| OLD | NEW |