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

Side by Side Diff: content/renderer/media/android/renderer_media_session_manager.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, 10 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
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/renderer_media_session_manager.h" 5 #include "content/renderer/media/android/renderer_media_session_manager.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "content/common/media/media_session_messages_android.h" 8 #include "content/common/media/media_session_messages_android.h"
9 #include "content/public/common/media_metadata.h"
9 #include "content/public/renderer/render_thread.h" 10 #include "content/public/renderer/render_thread.h"
10 #include "content/renderer/media/android/webmediasession_android.h" 11 #include "content/renderer/media/android/webmediasession_android.h"
11 12
12 namespace content { 13 namespace content {
13 14
14 static const int kDefaultMediaSessionID = 0; 15 static const int kDefaultMediaSessionID = 0;
15 16
16 RendererMediaSessionManager::RendererMediaSessionManager( 17 RendererMediaSessionManager::RendererMediaSessionManager(
17 RenderFrame* render_frame) 18 RenderFrame* render_frame)
18 : RenderFrameObserver(render_frame), 19 : RenderFrameObserver(render_frame),
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 } 53 }
53 54
54 void RendererMediaSessionManager::Deactivate( 55 void RendererMediaSessionManager::Deactivate(
55 int session_id, 56 int session_id,
56 scoped_ptr<blink::WebMediaSessionDeactivateCallback> callback) { 57 scoped_ptr<blink::WebMediaSessionDeactivateCallback> callback) {
57 int request_id = pending_deactivation_requests_.Add(callback.release()); 58 int request_id = pending_deactivation_requests_.Add(callback.release());
58 Send( 59 Send(
59 new MediaSessionHostMsg_Deactivate(routing_id(), session_id, request_id)); 60 new MediaSessionHostMsg_Deactivate(routing_id(), session_id, request_id));
60 } 61 }
61 62
63 void RendererMediaSessionManager::SetMetadata(
64 int session_id,
65 const MediaMetadata& metadata) {
66 // Apply some sanity checks on the MediaMetadata before sending over IPC.
67 MediaMetadata ipc_metadata;
68 ipc_metadata.title =
69 metadata.title.substr(0, MediaMetadata::kMaxIPCStringLength);
70 ipc_metadata.artist =
71 metadata.artist.substr(0, MediaMetadata::kMaxIPCStringLength);
72 ipc_metadata.album =
73 metadata.album.substr(0, MediaMetadata::kMaxIPCStringLength);
74
75 Send(new MediaSessionHostMsg_SetMetadata(routing_id(),
76 session_id,
77 ipc_metadata));
78 }
79
62 void RendererMediaSessionManager::OnDidActivate(int request_id, bool success) { 80 void RendererMediaSessionManager::OnDidActivate(int request_id, bool success) {
63 DCHECK(pending_activation_requests_.Lookup(request_id)) << request_id; 81 DCHECK(pending_activation_requests_.Lookup(request_id)) << request_id;
64 blink::WebMediaSessionActivateCallback* callback = 82 blink::WebMediaSessionActivateCallback* callback =
65 pending_activation_requests_.Lookup(request_id); 83 pending_activation_requests_.Lookup(request_id);
66 if (success) { 84 if (success) {
67 callback->onSuccess(); 85 callback->onSuccess();
68 } else { 86 } else {
69 callback->onError( 87 callback->onError(
70 blink::WebMediaSessionError(blink::WebMediaSessionError::Activate)); 88 blink::WebMediaSessionError(blink::WebMediaSessionError::Activate));
71 } 89 }
72 pending_activation_requests_.Remove(request_id); 90 pending_activation_requests_.Remove(request_id);
73 } 91 }
74 92
75 void RendererMediaSessionManager::OnDidDeactivate(int request_id) { 93 void RendererMediaSessionManager::OnDidDeactivate(int request_id) {
76 DCHECK(pending_deactivation_requests_.Lookup(request_id)) << request_id; 94 DCHECK(pending_deactivation_requests_.Lookup(request_id)) << request_id;
77 pending_deactivation_requests_.Lookup(request_id)->onSuccess(); 95 pending_deactivation_requests_.Lookup(request_id)->onSuccess();
78 pending_deactivation_requests_.Remove(request_id); 96 pending_deactivation_requests_.Remove(request_id);
79 } 97 }
80 98
81 } // namespace content 99 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698