OLD | NEW |
---|---|
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "chrome/browser/media/router/mojo/media_router_struct_traits.h" | 5 #include "chrome/browser/media/router/mojo/media_router_struct_traits.h" |
6 | 6 |
7 #include "chrome/browser/media/router/media_source.h" | 7 #include "chrome/browser/media/router/media_source.h" |
8 #include "url/mojo/url_gurl_struct_traits.h" | |
8 | 9 |
9 namespace mojo { | 10 namespace mojo { |
10 | 11 |
11 // static | 12 // static |
12 bool StructTraits<media_router::mojom::IssueDataView, media_router::IssueInfo>:: | 13 bool StructTraits<media_router::mojom::IssueDataView, media_router::IssueInfo>:: |
13 Read(media_router::mojom::IssueDataView data, | 14 Read(media_router::mojom::IssueDataView data, |
14 media_router::IssueInfo* out) { | 15 media_router::IssueInfo* out) { |
15 if (!data.ReadTitle(&out->title)) | 16 if (!data.ReadTitle(&out->title)) |
16 return false; | 17 return false; |
17 | 18 |
(...skipping 18 matching lines...) Expand all Loading... | |
36 | 37 |
37 out->route_id = route_id.value_or(std::string()); | 38 out->route_id = route_id.value_or(std::string()); |
38 | 39 |
39 out->is_blocking = data.is_blocking(); | 40 out->is_blocking = data.is_blocking(); |
40 out->help_page_id = data.help_page_id(); | 41 out->help_page_id = data.help_page_id(); |
41 | 42 |
42 return true; | 43 return true; |
43 } | 44 } |
44 | 45 |
45 // static | 46 // static |
46 bool StructTraits< | 47 bool StructTraits<media_router::mojom::MediaSinkDataView, |
47 media_router::mojom::MediaSinkDataView, | 48 media_router::MediaSinkInternal>:: |
48 media_router::MediaSink>::Read(media_router::mojom::MediaSinkDataView data, | 49 Read(media_router::mojom::MediaSinkDataView data, |
49 media_router::MediaSink* out) { | 50 media_router::MediaSinkInternal* out) { |
51 media_router::MediaSink sink; | |
imcheng
2017/02/24 23:54:21
Setting fields directly on out->sink would be more
zhaobin
2017/02/27 21:45:15
out->sink() returns const MediaSink&. It seems ok
| |
52 | |
50 media_router::MediaSink::Id id; | 53 media_router::MediaSink::Id id; |
51 if (!data.ReadSinkId(&id)) | 54 if (!data.ReadSinkId(&id)) |
mark a. foltz
2017/02/25 01:10:24
Enforce non-empty sink_id made up of valid charact
zhaobin
2017/02/27 21:45:15
Done.
| |
52 return false; | 55 return false; |
53 | 56 |
54 out->set_sink_id(id); | 57 sink.set_sink_id(id); |
55 | 58 |
56 std::string name; | 59 std::string name; |
57 if (!data.ReadName(&name)) | 60 if (!data.ReadName(&name)) |
58 return false; | 61 return false; |
59 | 62 |
60 out->set_name(name); | 63 sink.set_name(name); |
61 | 64 |
62 base::Optional<std::string> description; | 65 base::Optional<std::string> description; |
63 if (!data.ReadDescription(&description)) | 66 if (!data.ReadDescription(&description)) |
64 return false; | 67 return false; |
65 | 68 |
66 if (description) | 69 if (description) |
67 out->set_description(*description); | 70 sink.set_description(*description); |
68 | 71 |
69 base::Optional<std::string> domain; | 72 base::Optional<std::string> domain; |
70 if (!data.ReadDomain(&domain)) | 73 if (!data.ReadDomain(&domain)) |
71 return false; | 74 return false; |
72 | 75 |
73 if (domain) | 76 if (domain) |
74 out->set_domain(*domain); | 77 sink.set_domain(*domain); |
75 | 78 |
76 media_router::MediaSink::IconType icon_type; | 79 media_router::MediaSink::IconType icon_type; |
77 if (!data.ReadIconType(&icon_type)) | 80 if (!data.ReadIconType(&icon_type)) |
78 return false; | 81 return false; |
79 | 82 |
80 out->set_icon_type(icon_type); | 83 sink.set_icon_type(icon_type); |
84 | |
85 out->set_sink(sink); | |
86 | |
87 media_router::mojom::MediaSinkExtraDataDataView extra_data_data_view; | |
88 data.GetExtraDataDataView(&extra_data_data_view); | |
89 | |
90 if (extra_data_data_view.is_null()) { | |
91 return true; | |
92 } else if (extra_data_data_view.is_dial_media_sink()) { | |
93 media_router::DialSinkExtraData extra_data; | |
94 if (!extra_data_data_view.ReadDialMediaSink(&extra_data)) | |
95 return false; | |
96 | |
97 out->set_dial_data(extra_data); | |
98 } else if (extra_data_data_view.is_cast_media_sink()) { | |
99 media_router::CastSinkExtraData extra_data; | |
100 if (!extra_data_data_view.ReadCastMediaSink(&extra_data)) | |
101 return false; | |
102 | |
103 out->set_cast_data(extra_data); | |
104 } | |
81 | 105 |
82 return true; | 106 return true; |
83 } | 107 } |
84 | 108 |
85 // static | 109 // static |
110 bool StructTraits<media_router::mojom::DialMediaSinkDataView, | |
111 media_router::DialSinkExtraData>:: | |
112 Read(media_router::mojom::DialMediaSinkDataView data, | |
113 media_router::DialSinkExtraData* out) { | |
114 if (!data.ReadIpAddress(&out->ip_address)) | |
mark a. foltz
2017/02/25 01:10:24
Enforce valid ip_address?
zhaobin
2017/02/27 21:45:15
Done.
Note: MRP should not reach this code and se
| |
115 return false; | |
116 | |
117 if (!data.ReadModelName(&out->model_name)) | |
118 return false; | |
119 | |
120 if (!data.ReadAppUrl(&out->app_url)) | |
121 return false; | |
122 | |
123 return true; | |
124 } | |
125 | |
126 // static | |
127 bool StructTraits<media_router::mojom::CastMediaSinkDataView, | |
128 media_router::CastSinkExtraData>:: | |
129 Read(media_router::mojom::CastMediaSinkDataView data, | |
130 media_router::CastSinkExtraData* out) { | |
131 if (!data.ReadIpAddress(&out->ip_address)) | |
mark a. foltz
2017/02/25 01:10:24
Enforce valid ip_address?
zhaobin
2017/02/27 21:45:15
Done.
| |
132 return false; | |
133 | |
134 if (!data.ReadModelName(&out->model_name)) | |
135 return false; | |
136 | |
137 out->capabilities = data.capabilities(); | |
138 out->cast_channel_id = data.cast_channel_id(); | |
139 | |
140 return true; | |
141 } | |
142 | |
86 bool StructTraits<media_router::mojom::MediaRouteDataView, | 143 bool StructTraits<media_router::mojom::MediaRouteDataView, |
87 media_router::MediaRoute>:: | 144 media_router::MediaRoute>:: |
88 Read(media_router::mojom::MediaRouteDataView data, | 145 Read(media_router::mojom::MediaRouteDataView data, |
89 media_router::MediaRoute* out) { | 146 media_router::MediaRoute* out) { |
90 media_router::MediaRoute::Id media_route_id; | 147 media_router::MediaRoute::Id media_route_id; |
91 if (!data.ReadMediaRouteId(&media_route_id)) | 148 if (!data.ReadMediaRouteId(&media_route_id)) |
92 return false; | 149 return false; |
93 | 150 |
94 out->set_media_route_id(media_route_id); | 151 out->set_media_route_id(media_route_id); |
95 | 152 |
(...skipping 25 matching lines...) Expand all Loading... | |
121 | 178 |
122 out->set_local(data.is_local()); | 179 out->set_local(data.is_local()); |
123 out->set_for_display(data.for_display()); | 180 out->set_for_display(data.for_display()); |
124 out->set_incognito(data.is_incognito()); | 181 out->set_incognito(data.is_incognito()); |
125 out->set_offscreen_presentation(data.is_offscreen_presentation()); | 182 out->set_offscreen_presentation(data.is_offscreen_presentation()); |
126 | 183 |
127 return true; | 184 return true; |
128 } | 185 } |
129 | 186 |
130 } // namespace mojo | 187 } // namespace mojo |
OLD | NEW |