OLD | NEW |
---|---|
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 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
67 const MediaMetadata& metadata) { | 67 const MediaMetadata& metadata) { |
68 // Apply some sanity checks on the MediaMetadata before sending over IPC. | 68 // Apply some sanity checks on the MediaMetadata before sending over IPC. |
69 MediaMetadata ipc_metadata; | 69 MediaMetadata ipc_metadata; |
70 ipc_metadata.title = | 70 ipc_metadata.title = |
71 metadata.title.substr(0, MediaMetadata::kMaxIPCStringLength); | 71 metadata.title.substr(0, MediaMetadata::kMaxIPCStringLength); |
72 ipc_metadata.artist = | 72 ipc_metadata.artist = |
73 metadata.artist.substr(0, MediaMetadata::kMaxIPCStringLength); | 73 metadata.artist.substr(0, MediaMetadata::kMaxIPCStringLength); |
74 ipc_metadata.album = | 74 ipc_metadata.album = |
75 metadata.album.substr(0, MediaMetadata::kMaxIPCStringLength); | 75 metadata.album.substr(0, MediaMetadata::kMaxIPCStringLength); |
76 | 76 |
77 for (const MediaMetadata::Artwork& artwork : metadata.artwork) { | |
palmer
2016/06/20 21:34:21
Nit: Can use auto here too, to clarify the code.
Zhiqiang Zhang (Slow)
2016/06/21 11:08:42
Done.
| |
78 base::Optional<MediaMetadata::Artwork> sanitized_artwork = | |
79 MediaMetadata::SanitizeArtwork(artwork); | |
80 if (sanitized_artwork) | |
81 ipc_metadata.artwork.push_back(sanitized_artwork.value()); | |
82 } | |
83 | |
77 Send(new MediaSessionHostMsg_SetMetadata(routing_id(), | 84 Send(new MediaSessionHostMsg_SetMetadata(routing_id(), |
78 session_id, | 85 session_id, |
79 ipc_metadata)); | 86 ipc_metadata)); |
80 } | 87 } |
81 | 88 |
82 void RendererMediaSessionManager::OnDidActivate(int request_id, bool success) { | 89 void RendererMediaSessionManager::OnDidActivate(int request_id, bool success) { |
83 DCHECK(pending_activation_requests_.Lookup(request_id)) << request_id; | 90 DCHECK(pending_activation_requests_.Lookup(request_id)) << request_id; |
84 blink::WebMediaSessionActivateCallback* callback = | 91 blink::WebMediaSessionActivateCallback* callback = |
85 pending_activation_requests_.Lookup(request_id); | 92 pending_activation_requests_.Lookup(request_id); |
86 if (success) { | 93 if (success) { |
87 callback->onSuccess(); | 94 callback->onSuccess(); |
88 } else { | 95 } else { |
89 callback->onError( | 96 callback->onError( |
90 blink::WebMediaSessionError(blink::WebMediaSessionError::Activate)); | 97 blink::WebMediaSessionError(blink::WebMediaSessionError::Activate)); |
91 } | 98 } |
92 pending_activation_requests_.Remove(request_id); | 99 pending_activation_requests_.Remove(request_id); |
93 } | 100 } |
94 | 101 |
95 void RendererMediaSessionManager::OnDidDeactivate(int request_id) { | 102 void RendererMediaSessionManager::OnDidDeactivate(int request_id) { |
96 DCHECK(pending_deactivation_requests_.Lookup(request_id)) << request_id; | 103 DCHECK(pending_deactivation_requests_.Lookup(request_id)) << request_id; |
97 pending_deactivation_requests_.Lookup(request_id)->onSuccess(); | 104 pending_deactivation_requests_.Lookup(request_id)->onSuccess(); |
98 pending_deactivation_requests_.Remove(request_id); | 105 pending_deactivation_requests_.Remove(request_id); |
99 } | 106 } |
100 | 107 |
101 } // namespace content | 108 } // namespace content |
OLD | NEW |