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

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

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

Powered by Google App Engine
This is Rietveld 408576698