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

Side by Side Diff: content/renderer/media/android/webmediasession_android.cc

Issue 1515623002: Media Session: passing metadata from renderer/ to browser/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@media_session_ipc
Patch Set: semicolon Created 4 years, 11 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/renderer/media/android/renderer_media_session_manager.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/renderer/media/android/webmediasession_android.h" 5 #include "content/renderer/media/android/webmediasession_android.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "content/public/common/media_metadata.h"
9 #include "content/renderer/media/android/renderer_media_session_manager.h" 10 #include "content/renderer/media/android/renderer_media_session_manager.h"
11 #include "third_party/WebKit/public/platform/modules/mediasession/WebMediaMetada ta.h"
10 12
11 namespace content { 13 namespace content {
12 14
13 WebMediaSessionAndroid::WebMediaSessionAndroid( 15 WebMediaSessionAndroid::WebMediaSessionAndroid(
14 RendererMediaSessionManager* session_manager) 16 RendererMediaSessionManager* session_manager)
15 : session_manager_(session_manager) { 17 : session_manager_(session_manager) {
16 DCHECK(session_manager_); 18 DCHECK(session_manager_);
17 session_id_ = session_manager_->RegisterMediaSession(this); 19 session_id_ = session_manager_->RegisterMediaSession(this);
18 } 20 }
19 21
20 WebMediaSessionAndroid::~WebMediaSessionAndroid() { 22 WebMediaSessionAndroid::~WebMediaSessionAndroid() {
21 session_manager_->UnregisterMediaSession(session_id_); 23 session_manager_->UnregisterMediaSession(session_id_);
22 } 24 }
23 25
24 void WebMediaSessionAndroid::activate( 26 void WebMediaSessionAndroid::activate(
25 blink::WebMediaSessionActivateCallback* callback) { 27 blink::WebMediaSessionActivateCallback* callback) {
26 session_manager_->Activate(session_id_, make_scoped_ptr(callback)); 28 session_manager_->Activate(session_id_, make_scoped_ptr(callback));
27 } 29 }
28 30
29 void WebMediaSessionAndroid::deactivate( 31 void WebMediaSessionAndroid::deactivate(
30 blink::WebMediaSessionDeactivateCallback* callback) { 32 blink::WebMediaSessionDeactivateCallback* callback) {
31 session_manager_->Deactivate(session_id_, make_scoped_ptr(callback)); 33 session_manager_->Deactivate(session_id_, make_scoped_ptr(callback));
32 } 34 }
33 35
34 void WebMediaSessionAndroid::setMetadata( 36 void WebMediaSessionAndroid::setMetadata(
35 const blink::WebMediaMetadata* metadata) { 37 const blink::WebMediaMetadata* web_metadata) {
36 NOTIMPLEMENTED(); 38 MediaMetadata metadata;
39 if (web_metadata) {
40 metadata.title = web_metadata->title;
41 metadata.artist = web_metadata->artist;
42 metadata.album = web_metadata->album;
43 }
44
45 session_manager_->SetMetadata(session_id_, metadata);
37 } 46 }
38 47
39 } // namespace content 48 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/android/renderer_media_session_manager.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698