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

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

Issue 2442303002: Adding new media controls to MediaNotification (Closed)
Patch Set: addressed boliu's comments Created 4 years, 1 month 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/session/media_session_service_impl.h" 5 #include "content/browser/media/session/media_session_service_impl.h"
6 6
7 #include "content/browser/media/session/media_metadata_sanitizer.h" 7 #include "content/browser/media/session/media_metadata_sanitizer.h"
8 #include "content/browser/media/session/media_session.h" 8 #include "content/browser/media/session/media_session.h"
9 #include "content/browser/web_contents/web_contents_impl.h" 9 #include "content/browser/web_contents/web_contents_impl.h"
10 #include "content/public/browser/browser_thread.h" 10 #include "content/public/browser/browser_thread.h"
11 #include "content/public/browser/web_contents.h" 11 #include "content/public/browser/web_contents.h"
12 12
13 namespace content { 13 namespace content {
14 14
15 MediaSessionServiceImpl::MediaSessionServiceImpl( 15 MediaSessionServiceImpl::MediaSessionServiceImpl(
16 RenderFrameHost* render_frame_host) 16 RenderFrameHost* render_frame_host)
17 : render_frame_host_(render_frame_host) {} 17 : render_frame_host_(render_frame_host) {
18 MediaSession* session = GetMediaSession();
19 if (session)
20 session->SetMediaSessionService(this);
21 }
18 22
19 MediaSessionServiceImpl::~MediaSessionServiceImpl() = default; 23 MediaSessionServiceImpl::~MediaSessionServiceImpl() {
24 MediaSession* session = GetMediaSession();
25 if (session)
26 session->SetMediaSessionService(nullptr);
27 }
20 28
21 // static 29 // static
22 void MediaSessionServiceImpl::Create( 30 void MediaSessionServiceImpl::Create(
23 RenderFrameHost* render_frame_host, 31 RenderFrameHost* render_frame_host,
24 blink::mojom::MediaSessionServiceRequest request) { 32 blink::mojom::MediaSessionServiceRequest request) {
25 MediaSessionServiceImpl* impl = 33 MediaSessionServiceImpl* impl =
26 new MediaSessionServiceImpl(render_frame_host); 34 new MediaSessionServiceImpl(render_frame_host);
27 impl->Bind(std::move(request)); 35 impl->Bind(std::move(request));
28 } 36 }
29 37
30 void MediaSessionServiceImpl::SetClient( 38 void MediaSessionServiceImpl::SetClient(
31 blink::mojom::MediaSessionClientPtr client) { 39 blink::mojom::MediaSessionClientPtr client) {
32 client_ = std::move(client); 40 client_ = std::move(client);
33 } 41 }
34 42
35 void MediaSessionServiceImpl::SetMetadata( 43 void MediaSessionServiceImpl::SetMetadata(
36 const base::Optional<content::MediaMetadata>& metadata) { 44 const base::Optional<content::MediaMetadata>& metadata) {
37 // When receiving a MediaMetadata, the browser process can't trust that it is 45 // When receiving a MediaMetadata, the browser process can't trust that it is
38 // coming from a known and secure source. It must be processed accordingly. 46 // coming from a known and secure source. It must be processed accordingly.
39 if (metadata.has_value() && 47 if (metadata.has_value() &&
40 !MediaMetadataSanitizer::CheckSanity(metadata.value())) { 48 !MediaMetadataSanitizer::CheckSanity(metadata.value())) {
41 render_frame_host_->GetProcess()->ShutdownForBadMessage( 49 render_frame_host_->GetProcess()->ShutdownForBadMessage(
42 RenderProcessHost::CrashReportMode::GENERATE_CRASH_DUMP); 50 RenderProcessHost::CrashReportMode::GENERATE_CRASH_DUMP);
43 return; 51 return;
44 } 52 }
45 53
46 WebContentsImpl* contents = static_cast<WebContentsImpl*>( 54 MediaSession* session = GetMediaSession();
47 WebContentsImpl::FromRenderFrameHost(render_frame_host_)); 55 if (session)
48 if (contents) 56 session->SetMetadata(metadata);
49 MediaSession::Get(contents)->SetMetadata(metadata);
50 } 57 }
51 58
52 void MediaSessionServiceImpl::EnableAction( 59 void MediaSessionServiceImpl::EnableAction(
53 blink::mojom::MediaSessionAction action) { 60 blink::mojom::MediaSessionAction action) {
54 // TODO(zqzhang): Plumb this signal to Java. See https://crbug.com/656563 61 MediaSession* session = GetMediaSession();
55 NOTIMPLEMENTED(); 62 if (session)
63 session->OnMediaSessionEnabledAction(action);
56 } 64 }
57 65
58 void MediaSessionServiceImpl::DisableAction( 66 void MediaSessionServiceImpl::DisableAction(
59 blink::mojom::MediaSessionAction action) { 67 blink::mojom::MediaSessionAction action) {
60 // TODO(zqzhang): Plumb this signal to Java. See https://crbug.com/656563 68 MediaSession* session = GetMediaSession();
61 NOTIMPLEMENTED(); 69 if (session)
70 session->OnMediaSessionEnabledAction(action);
71 }
72
73 MediaSession* MediaSessionServiceImpl::GetMediaSession() {
74 WebContentsImpl* contents = static_cast<WebContentsImpl*>(
75 WebContentsImpl::FromRenderFrameHost(render_frame_host_));
76 if (!contents)
77 return nullptr;
78 if (render_frame_host_ != contents->GetMainFrame())
79 return nullptr;
80 return MediaSession::Get(contents);
62 } 81 }
63 82
64 void MediaSessionServiceImpl::Bind( 83 void MediaSessionServiceImpl::Bind(
65 blink::mojom::MediaSessionServiceRequest request) { 84 blink::mojom::MediaSessionServiceRequest request) {
66 binding_.reset(new mojo::Binding<blink::mojom::MediaSessionService>( 85 binding_.reset(new mojo::Binding<blink::mojom::MediaSessionService>(
67 this, std::move(request))); 86 this, std::move(request)));
68 } 87 }
69 88
70 } // namespace content 89 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698