| 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/webmediasession_android.h" | 5 #include "content/renderer/media/android/webmediasession_android.h" |
| 6 | 6 |
| 7 #include <iterator> |
| 7 #include <memory> | 8 #include <memory> |
| 8 | 9 |
| 9 #include "base/logging.h" | 10 #include "base/logging.h" |
| 10 #include "base/memory/ptr_util.h" | 11 #include "base/memory/ptr_util.h" |
| 11 #include "content/public/common/media_metadata.h" | 12 #include "content/public/common/media_metadata.h" |
| 12 #include "content/renderer/media/android/renderer_media_session_manager.h" | 13 #include "content/renderer/media/android/renderer_media_session_manager.h" |
| 14 #include "third_party/WebKit/public/platform/WebIconSizesParser.h" |
| 15 #include "third_party/WebKit/public/platform/WebSize.h" |
| 13 #include "third_party/WebKit/public/platform/modules/mediasession/WebMediaMetada
ta.h" | 16 #include "third_party/WebKit/public/platform/modules/mediasession/WebMediaMetada
ta.h" |
| 14 | 17 |
| 15 namespace content { | 18 namespace content { |
| 16 | 19 |
| 17 WebMediaSessionAndroid::WebMediaSessionAndroid( | 20 WebMediaSessionAndroid::WebMediaSessionAndroid( |
| 18 RendererMediaSessionManager* session_manager) | 21 RendererMediaSessionManager* session_manager) |
| 19 : session_manager_(session_manager) { | 22 : session_manager_(session_manager) { |
| 20 DCHECK(session_manager_); | 23 DCHECK(session_manager_); |
| 21 media_session_id_ = session_manager_->RegisterMediaSession(this); | 24 media_session_id_ = session_manager_->RegisterMediaSession(this); |
| 22 } | 25 } |
| (...skipping 12 matching lines...) Expand all Loading... |
| 35 session_manager_->Deactivate(media_session_id_, base::WrapUnique(callback)); | 38 session_manager_->Deactivate(media_session_id_, base::WrapUnique(callback)); |
| 36 } | 39 } |
| 37 | 40 |
| 38 void WebMediaSessionAndroid::setMetadata( | 41 void WebMediaSessionAndroid::setMetadata( |
| 39 const blink::WebMediaMetadata* web_metadata) { | 42 const blink::WebMediaMetadata* web_metadata) { |
| 40 MediaMetadata metadata; | 43 MediaMetadata metadata; |
| 41 if (web_metadata) { | 44 if (web_metadata) { |
| 42 metadata.title = web_metadata->title; | 45 metadata.title = web_metadata->title; |
| 43 metadata.artist = web_metadata->artist; | 46 metadata.artist = web_metadata->artist; |
| 44 metadata.album = web_metadata->album; | 47 metadata.album = web_metadata->album; |
| 48 for (const auto& web_artwork : web_metadata->artwork) { |
| 49 MediaMetadata::Artwork artwork; |
| 50 artwork.src = GURL(base::string16(web_artwork.src)); |
| 51 artwork.type = web_artwork.type; |
| 52 blink::WebVector<blink::WebSize> web_sizes = |
| 53 blink::WebIconSizesParser::parseIconSizes(web_artwork.sizes); |
| 54 std::copy(web_sizes.begin(), web_sizes.end(), |
| 55 std::back_inserter(artwork.sizes)); |
| 56 metadata.artwork.push_back(artwork); |
| 57 } |
| 45 } | 58 } |
| 46 | 59 |
| 47 session_manager_->SetMetadata(media_session_id_, metadata); | 60 session_manager_->SetMetadata(media_session_id_, metadata); |
| 48 } | 61 } |
| 49 | 62 |
| 50 } // namespace content | 63 } // namespace content |
| OLD | NEW |