Index: chrome/browser/media/router/mojo/media_router_struct_traits.h |
diff --git a/chrome/browser/media/router/mojo/media_router_struct_traits.h b/chrome/browser/media/router/mojo/media_router_struct_traits.h |
index 1c6623fcc5d53abde23fd1c4e9efd919a663be25..b4585b58d34c500a5980c36a3acda024655caced 100644 |
--- a/chrome/browser/media/router/mojo/media_router_struct_traits.h |
+++ b/chrome/browser/media/router/mojo/media_router_struct_traits.h |
@@ -6,9 +6,12 @@ |
#define CHROME_BROWSER_MEDIA_ROUTER_MOJO_MEDIA_ROUTER_STRUCT_TRAITS_H_ |
#include <string> |
+#include <utility> |
+#include <vector> |
#include "chrome/browser/media/router/issue.h" |
#include "chrome/browser/media/router/media_sink.h" |
+#include "chrome/browser/media/router/media_status.h" |
#include "chrome/browser/media/router/mojo/media_router.mojom.h" |
#include "chrome/browser/media/router/route_request_result.h" |
#include "mojo/common/common_custom_types_struct_traits.h" |
@@ -311,6 +314,59 @@ struct StructTraits<media_router::mojom::MediaRouteDataView, |
} |
}; |
+// MediaStatus |
+ |
+template <> |
+struct StructTraits<media_router::mojom::MediaStatusDataView, |
+ media_router::MediaStatus> { |
+ static bool Read(media_router::mojom::MediaStatusDataView data, |
+ media_router::MediaStatus* out); |
+ |
+ static std::string title(const media_router::MediaStatus& status) { |
dcheng
2017/03/08 01:08:20
const std::string& here and below, to avoid tempor
takumif
2017/03/08 04:24:03
Done.
|
+ return status.title; |
+ } |
+ |
+ static std::string status(const media_router::MediaStatus& status) { |
+ return status.status; |
+ } |
+ |
+ static bool can_play_pause(const media_router::MediaStatus& status) { |
+ return status.can_play_pause; |
+ } |
+ |
+ static bool can_mute(const media_router::MediaStatus& status) { |
+ return status.can_mute; |
+ } |
+ |
+ static bool can_set_volume(const media_router::MediaStatus& status) { |
+ return status.can_set_volume; |
+ } |
+ |
+ static bool can_seek(const media_router::MediaStatus& status) { |
+ return status.can_seek; |
+ } |
+ |
+ static bool is_paused(const media_router::MediaStatus& status) { |
+ return status.is_paused; |
+ } |
+ |
+ static bool is_muted(const media_router::MediaStatus& status) { |
+ return status.is_muted; |
+ } |
+ |
+ static float volume(const media_router::MediaStatus& status) { |
+ return status.volume; |
+ } |
+ |
+ static uint32_t duration(const media_router::MediaStatus& status) { |
+ return status.duration; |
+ } |
+ |
+ static uint32_t current_time(const media_router::MediaStatus& status) { |
+ return status.current_time; |
+ } |
+}; |
+ |
// PresentationConnectionState |
template <> |