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 <utility> | |
8 | |
7 #include "base/memory/ptr_util.h" | 9 #include "base/memory/ptr_util.h" |
8 #include "content/browser/media/android/browser_media_player_manager.h" | 10 #include "content/browser/media/android/browser_media_player_manager.h" |
9 #include "content/browser/media/android/browser_media_session_manager.h" | 11 #include "content/browser/media/android/browser_media_session_manager.h" |
10 #include "content/browser/media/android/browser_surface_view_manager.h" | 12 #include "content/browser/media/android/browser_surface_view_manager.h" |
11 #include "content/browser/media/cdm/browser_cdm_manager.h" | 13 #include "content/browser/media/cdm/browser_cdm_manager.h" |
12 #include "content/browser/web_contents/web_contents_impl.h" | 14 #include "content/browser/web_contents/web_contents_impl.h" |
13 #include "content/common/media/media_player_delegate_messages.h" | 15 #include "content/common/media/media_player_delegate_messages.h" |
14 #include "content/common/media/media_player_messages_android.h" | 16 #include "content/common/media/media_player_messages_android.h" |
15 #include "content/common/media/media_session_messages_android.h" | 17 #include "content/common/media/media_session_messages_android.h" |
16 #include "content/common/media/surface_view_manager_messages_android.h" | 18 #include "content/common/media/surface_view_manager_messages_android.h" |
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
73 auto it = surface_view_managers_.find(render_frame_host); | 75 auto it = surface_view_managers_.find(render_frame_host); |
74 if (it != surface_view_managers_.end()) | 76 if (it != surface_view_managers_.end()) |
75 return it->second; | 77 return it->second; |
76 | 78 |
77 BrowserSurfaceViewManager* manager = | 79 BrowserSurfaceViewManager* manager = |
78 new BrowserSurfaceViewManager(render_frame_host); | 80 new BrowserSurfaceViewManager(render_frame_host); |
79 surface_view_managers_.set(render_frame_host, base::WrapUnique(manager)); | 81 surface_view_managers_.set(render_frame_host, base::WrapUnique(manager)); |
80 return manager; | 82 return manager; |
81 } | 83 } |
82 | 84 |
85 void MediaWebContentsObserverAndroid::SetMediaSessionManagerForTest( | |
86 RenderFrameHost* render_frame_host, | |
87 std::unique_ptr<BrowserMediaSessionManager>& manager) { | |
88 media_session_managers_.set( | |
89 render_frame_host, | |
90 std::forward<std::unique_ptr<BrowserMediaSessionManager>>(manager)); | |
dcheng
2016/07/06 02:34:15
This should just be std::move(manager) (once the a
Zhiqiang Zhang (Slow)
2016/07/06 15:38:38
Done.
| |
91 } | |
92 | |
83 void MediaWebContentsObserverAndroid::SuspendAllMediaPlayers() { | 93 void MediaWebContentsObserverAndroid::SuspendAllMediaPlayers() { |
84 web_contents()->ForEachFrame( | 94 web_contents()->ForEachFrame( |
85 base::Bind(&SuspendAllMediaPlayersInRenderFrame)); | 95 base::Bind(&SuspendAllMediaPlayersInRenderFrame)); |
86 } | 96 } |
87 | 97 |
88 bool MediaWebContentsObserverAndroid::RequestPlay( | 98 bool MediaWebContentsObserverAndroid::RequestPlay( |
89 RenderFrameHost* render_frame_host, | 99 RenderFrameHost* render_frame_host, |
90 int delegate_id, | 100 int delegate_id, |
91 bool has_audio, | 101 bool has_audio, |
92 bool is_remote, | 102 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; | 287 NOTREACHED() << "OnSetCdm: CDM not found for " << cdm_id; |
278 return; | 288 return; |
279 } | 289 } |
280 | 290 |
281 // TODO(xhwang): This could possibly fail. In that case we should reject the | 291 // TODO(xhwang): This could possibly fail. In that case we should reject the |
282 // promise. | 292 // promise. |
283 media_player->SetCdm(cdm); | 293 media_player->SetCdm(cdm); |
284 } | 294 } |
285 | 295 |
286 } // namespace content | 296 } // namespace content |
OLD | NEW |