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

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

Issue 2015433003: Implement MediaMetadata artwork in content (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixed tests Created 4 years, 6 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/common/media_metadata.h"
10 #include "content/public/renderer/render_thread.h" 10 #include "content/public/renderer/render_thread.h"
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 int session_id, 62 int session_id,
63 const MediaMetadata& metadata) { 63 const MediaMetadata& metadata) {
64 // Apply some sanity checks on the MediaMetadata before sending over IPC. 64 // Apply some sanity checks on the MediaMetadata before sending over IPC.
65 MediaMetadata ipc_metadata; 65 MediaMetadata ipc_metadata;
66 ipc_metadata.title = 66 ipc_metadata.title =
67 metadata.title.substr(0, MediaMetadata::kMaxIPCStringLength); 67 metadata.title.substr(0, MediaMetadata::kMaxIPCStringLength);
68 ipc_metadata.artist = 68 ipc_metadata.artist =
69 metadata.artist.substr(0, MediaMetadata::kMaxIPCStringLength); 69 metadata.artist.substr(0, MediaMetadata::kMaxIPCStringLength);
70 ipc_metadata.album = 70 ipc_metadata.album =
71 metadata.album.substr(0, MediaMetadata::kMaxIPCStringLength); 71 metadata.album.substr(0, MediaMetadata::kMaxIPCStringLength);
72 ipc_metadata.artworks = metadata.artworks;
72 73
73 Send(new MediaSessionHostMsg_SetMetadata(routing_id(), 74 Send(new MediaSessionHostMsg_SetMetadata(routing_id(),
74 session_id, 75 session_id,
75 ipc_metadata)); 76 ipc_metadata));
76 } 77 }
77 78
78 void RendererMediaSessionManager::OnDidActivate(int request_id, bool success) { 79 void RendererMediaSessionManager::OnDidActivate(int request_id, bool success) {
79 DCHECK(pending_activation_requests_.Lookup(request_id)) << request_id; 80 DCHECK(pending_activation_requests_.Lookup(request_id)) << request_id;
80 blink::WebMediaSessionActivateCallback* callback = 81 blink::WebMediaSessionActivateCallback* callback =
81 pending_activation_requests_.Lookup(request_id); 82 pending_activation_requests_.Lookup(request_id);
82 if (success) { 83 if (success) {
83 callback->onSuccess(); 84 callback->onSuccess();
84 } else { 85 } else {
85 callback->onError( 86 callback->onError(
86 blink::WebMediaSessionError(blink::WebMediaSessionError::Activate)); 87 blink::WebMediaSessionError(blink::WebMediaSessionError::Activate));
87 } 88 }
88 pending_activation_requests_.Remove(request_id); 89 pending_activation_requests_.Remove(request_id);
89 } 90 }
90 91
91 void RendererMediaSessionManager::OnDidDeactivate(int request_id) { 92 void RendererMediaSessionManager::OnDidDeactivate(int request_id) {
92 DCHECK(pending_deactivation_requests_.Lookup(request_id)) << request_id; 93 DCHECK(pending_deactivation_requests_.Lookup(request_id)) << request_id;
93 pending_deactivation_requests_.Lookup(request_id)->onSuccess(); 94 pending_deactivation_requests_.Lookup(request_id)->onSuccess();
94 pending_deactivation_requests_.Remove(request_id); 95 pending_deactivation_requests_.Remove(request_id);
95 } 96 }
96 97
97 } // namespace content 98 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698