[Media Router] Add MediaSink subtypes

chrome/browser/media/router/mojo/media_router_struct_traits.h

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_MEDIA_ROUTER_MOJO_MEDIA_ROUTER_STRUCT_TRAITS_H_
 #define CHROME_BROWSER_MEDIA_ROUTER_MOJO_MEDIA_ROUTER_STRUCT_TRAITS_H_
 
 #include <string>
 
 #include "chrome/browser/media/router/issue.h"
-#include "chrome/browser/media/router/media_sink.h"
+#include "chrome/browser/media/router/media_sink_internal.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"
 
 namespace mojo {
 
 // Issue
 
 template <>
 struct EnumTraits<media_router::mojom::Issue::ActionType,
@@ skipping 52 matching lines @@
         return true;
       case media_router::mojom::Issue::Severity::NOTIFICATION:
         *output = media_router::IssueInfo::Severity::NOTIFICATION;
         return true;
     }
     return false;
   }
 };
 
 template <>
+struct UnionTraits<media_router::mojom::MediaSinkExtraDataDataView,
+                   media_router::MediaSinkInternal> {
+  static media_router::mojom::MediaSinkExtraDataDataView::Tag GetTag(
+      const media_router::MediaSinkInternal& sink) {
+    if (sink.is_dial_sink()) {
+      return media_router::mojom::MediaSinkExtraDataDataView::Tag::
+          DIAL_MEDIA_SINK;
+    } else if (sink.is_cast_sink()) {
+      return media_router::mojom::MediaSinkExtraDataDataView::Tag::
+          CAST_MEDIA_SINK;
+    }
+    NOTREACHED();
+    return media_router::mojom::MediaSinkExtraDataDataView::Tag::
+        CAST_MEDIA_SINK;
+  }
+
+  static bool IsNull(const media_router::MediaSinkInternal& sink) {

[mark a. foltz, 2017/02/25 01:10:24]

If we aren't passing any null sinks you don't need to define IsNull().

[zhaobin, 2017/02/27 21:45:15]

This is needed so Generic sink does not read extra_data field when serializing
to mojo object.

+    return !sink.is_cast_sink() && !sink.is_dial_sink();
+  }
+
+  static const media_router::DialSinkExtraData& dial_media_sink(
+      const media_router::MediaSinkInternal& sink) {
+    return sink.dial_data();
+  }
+
+  static const media_router::CastSinkExtraData& cast_media_sink(
+      const media_router::MediaSinkInternal& sink) {
+    return sink.cast_data();
+  }
+};
+
+template <>
+struct StructTraits<media_router::mojom::DialMediaSinkDataView,
+                    media_router::DialSinkExtraData> {
+  static base::Optional<std::string> model_name(
+      const media_router::DialSinkExtraData& extra_data) {
+    return extra_data.model_name;
+  }
+
+  static const std::string& ip_address(
+      const media_router::DialSinkExtraData& extra_data) {
+    return extra_data.ip_address;
+  }
+
+  static const GURL& app_url(
+      const media_router::DialSinkExtraData& extra_data) {
+    return extra_data.app_url;
+  }
+
+  static bool Read(media_router::mojom::DialMediaSinkDataView data,
+                   media_router::DialSinkExtraData* out);
+};
+
+template <>
+struct StructTraits<media_router::mojom::CastMediaSinkDataView,
+                    media_router::CastSinkExtraData> {
+  static base::Optional<std::string> model_name(
+      const media_router::CastSinkExtraData& extra_data) {
+    return extra_data.model_name;
+  }
+
+  static const std::string& ip_address(
+      const media_router::CastSinkExtraData& extra_data) {
+    return extra_data.ip_address;
+  }
+
+  static int32_t capabilities(
+      const media_router::CastSinkExtraData& extra_data) {
+    return extra_data.capabilities;
+  }
+
+  static int32_t cast_channel_id(
+      const media_router::CastSinkExtraData& extra_data) {
+    return extra_data.cast_channel_id;
+  }
+
+  static bool Read(media_router::mojom::CastMediaSinkDataView data,
+                   media_router::CastSinkExtraData* out);
+};
+
+template <>
 struct StructTraits<media_router::mojom::RouteMessageDataView,
                     media_router::RouteMessage> {
   static media_router::mojom::RouteMessage::Type type(
       const media_router::RouteMessage& msg) {
     switch (msg.type) {
       case media_router::RouteMessage::TEXT:
         return media_router::mojom::RouteMessage::Type::TEXT;
       case media_router::RouteMessage::BINARY:
         return media_router::mojom::RouteMessage::Type::BINARY;
     }
@@ skipping 127 matching lines @@
       case media_router::mojom::MediaSink::IconType::GENERIC:
         *output = media_router::MediaSink::GENERIC;
         return true;
     }
     return false;
   }
 };
 
 template <>
 struct StructTraits<media_router::mojom::MediaSinkDataView,
-                    media_router::MediaSink> {
+                    media_router::MediaSinkInternal> {
   static bool Read(media_router::mojom::MediaSinkDataView data,
-                   media_router::MediaSink* out);
+                   media_router::MediaSinkInternal* out);
 
-  static std::string sink_id(const media_router::MediaSink& sink) {
-    return sink.id();
+  static std::string sink_id(
+      const media_router::MediaSinkInternal& sink_internal) {
+    return sink_internal.sink().id();
   }
 
-  static std::string name(const media_router::MediaSink& sink) {
-    return sink.name();
+  static std::string name(
+      const media_router::MediaSinkInternal& sink_internal) {
+    return sink_internal.sink().name();
   }
 
   static base::Optional<std::string> description(
-      const media_router::MediaSink& sink) {
-    return sink.description();
+      const media_router::MediaSinkInternal& sink_internal) {
+    return sink_internal.sink().description();
   }
 
   static base::Optional<std::string> domain(
-      const media_router::MediaSink& sink) {
-    return sink.domain();
+      const media_router::MediaSinkInternal& sink_internal) {
+    return sink_internal.sink().domain();
   }
 
   static media_router::MediaSink::IconType icon_type(
-      const media_router::MediaSink& sink) {
-    return sink.icon_type();
+      const media_router::MediaSinkInternal& sink_internal) {
+    return sink_internal.sink().icon_type();
+  }
+
+  static const media_router::MediaSinkInternal& extra_data(
+      const media_router::MediaSinkInternal& sink_internal) {
+    return sink_internal;
   }
 };
 
 // MediaRoute
 
 template <>
 struct StructTraits<media_router::mojom::MediaRouteDataView,
                     media_router::MediaRoute> {
   static bool Read(media_router::mojom::MediaRouteDataView data,
                    media_router::MediaRoute* out);
@@ skipping 208 matching lines @@
         *output = media_router::RouteRequestResult::CANCELLED;
         return true;
     }
     return false;
   }
 };
 
 }  // namespace mojo
 
 #endif  // CHROME_BROWSER_MEDIA_ROUTER_MOJO_MEDIA_ROUTER_STRUCT_TRAITS_H_