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

Side by Side Diff: content/browser/media/session/media_session_service_impl.cc

Issue 2399023002: Make MediaSession available on Desktop (Closed)
Patch Set: merge BrowserMediaSessionManager into MediaSessionServiceImpl, temporarily removing BrowserTests Created 4 years, 2 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/session/media_session_service_impl.h ('k') | content/common/BUILD.gn » ('j') | 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_session_service_impl.h" 5 #include "content/browser/media/session/media_session_service_impl.h"
6 6
7 #include "base/strings/utf_string_conversions.h" 7 #include "content/browser/media/session/media_metadata_sanitizer.h"
8 #include "content/browser/media/android/browser_media_session_manager.h"
9 #include "content/browser/media/android/media_web_contents_observer_android.h"
10 #include "content/browser/web_contents/web_contents_impl.h" 8 #include "content/browser/web_contents/web_contents_impl.h"
11 #include "content/public/browser/browser_thread.h" 9 #include "content/public/browser/browser_thread.h"
12 #include "content/public/browser/web_contents.h" 10 #include "content/public/browser/web_contents.h"
13 #include "content/public/common/media_metadata.h"
14 11
15 namespace content { 12 namespace content {
16 13
17 MediaSessionServiceImpl::MediaSessionServiceImpl( 14 MediaSessionServiceImpl::MediaSessionServiceImpl(
18 RenderFrameHost* render_frame_host) 15 RenderFrameHost* render_frame_host)
19 : render_frame_host_(render_frame_host) {} 16 : render_frame_host_(render_frame_host) {}
20 17
21 MediaSessionServiceImpl::~MediaSessionServiceImpl() = default; 18 MediaSessionServiceImpl::~MediaSessionServiceImpl() = default;
22 19
23 // static 20 // static
24 void MediaSessionServiceImpl::Create( 21 void MediaSessionServiceImpl::Create(
25 RenderFrameHost* render_frame_host, 22 RenderFrameHost* render_frame_host,
26 blink::mojom::MediaSessionServiceRequest request) { 23 blink::mojom::MediaSessionServiceRequest request) {
27 MediaSessionServiceImpl* impl = 24 MediaSessionServiceImpl* impl =
28 new MediaSessionServiceImpl(render_frame_host); 25 new MediaSessionServiceImpl(render_frame_host);
29 impl->Bind(std::move(request)); 26 impl->Bind(std::move(request));
30 } 27 }
31 28
32 void MediaSessionServiceImpl::SetMetadata( 29 void MediaSessionServiceImpl::SetMetadata(
33 const base::Optional<content::MediaMetadata>& metadata) { 30 const base::Optional<content::MediaMetadata>& metadata) {
34 WebContentsImpl* contents = static_cast<WebContentsImpl*>( 31 // When receiving a MediaMetadata, the browser process can't trust that it is
35 WebContents::FromRenderFrameHost(render_frame_host_)); 32 // coming from a known and secure source. It must be processed accordingly.
36 DCHECK(contents); 33 if (metadata.has_value() &&
37 MediaWebContentsObserverAndroid::FromWebContents(contents) 34 !MediaMetadataSanitizer::CheckSanity(metadata.value())) {
38 ->GetMediaSessionManager(render_frame_host_) 35 render_frame_host_->GetProcess()->ShutdownForBadMessage(
39 ->OnSetMetadata(0, metadata); 36 RenderProcessHost::CrashReportMode::GENERATE_CRASH_DUMP);
37 return;
38 }
39
40 metadata_ = metadata;
41
42 NOTIMPLEMENTED();
sandersd (OOO until July 31) 2016/10/07 22:33:48 ?
Zhiqiang Zhang (Slow) 2016/10/07 22:37:03 Yes, this `NOTIMPLEMENTED` was from BrowserMediaSe
40 } 43 }
41 44
42 void MediaSessionServiceImpl::Bind( 45 void MediaSessionServiceImpl::Bind(
43 blink::mojom::MediaSessionServiceRequest request) { 46 blink::mojom::MediaSessionServiceRequest request) {
44 binding_.reset(new mojo::Binding<blink::mojom::MediaSessionService>( 47 binding_.reset(new mojo::Binding<blink::mojom::MediaSessionService>(
45 this, std::move(request))); 48 this, std::move(request)));
46 } 49 }
47 50
48 } // namespace content 51 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/media/session/media_session_service_impl.h ('k') | content/common/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698