Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1296)

Side by Side Diff: chrome/browser/media/router/mojo/media_router_struct_traits.cc

Issue 2675033002: [Media Router] Add MediaSink subtypes (Closed)
Patch Set: resolve code review comments from Derek and Mark Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 "net/interfaces/ip_address_struct_traits.h"
9 #include "url/mojo/url_gurl_struct_traits.h"
8 10
9 namespace mojo { 11 namespace mojo {
10 12
11 // static 13 // static
12 bool StructTraits<media_router::mojom::IssueDataView, media_router::IssueInfo>:: 14 bool StructTraits<media_router::mojom::IssueDataView, media_router::IssueInfo>::
13 Read(media_router::mojom::IssueDataView data, 15 Read(media_router::mojom::IssueDataView data,
14 media_router::IssueInfo* out) { 16 media_router::IssueInfo* out) {
15 if (!data.ReadTitle(&out->title)) 17 if (!data.ReadTitle(&out->title))
16 return false; 18 return false;
17 19
(...skipping 18 matching lines...) Expand all
36 38
37 out->route_id = route_id.value_or(std::string()); 39 out->route_id = route_id.value_or(std::string());
38 40
39 out->is_blocking = data.is_blocking(); 41 out->is_blocking = data.is_blocking();
40 out->help_page_id = data.help_page_id(); 42 out->help_page_id = data.help_page_id();
41 43
42 return true; 44 return true;
43 } 45 }
44 46
45 // static 47 // static
46 bool StructTraits< 48 media_router::mojom::MediaSinkExtraDataDataView::Tag
47 media_router::mojom::MediaSinkDataView, 49 UnionTraits<media_router::mojom::MediaSinkExtraDataDataView,
48 media_router::MediaSink>::Read(media_router::mojom::MediaSinkDataView data, 50 media_router::MediaSinkInternal>::
49 media_router::MediaSink* out) { 51 GetTag(const media_router::MediaSinkInternal& sink) {
52 if (sink.is_dial_sink()) {
53 return media_router::mojom::MediaSinkExtraDataDataView::Tag::
54 DIAL_MEDIA_SINK;
55 } else if (sink.is_cast_sink()) {
56 return media_router::mojom::MediaSinkExtraDataDataView::Tag::
57 CAST_MEDIA_SINK;
58 }
59 NOTREACHED();
60 return media_router::mojom::MediaSinkExtraDataDataView::Tag::CAST_MEDIA_SINK;
61 }
62
63 // static
64 bool StructTraits<media_router::mojom::MediaSinkDataView,
65 media_router::MediaSinkInternal>::
66 Read(media_router::mojom::MediaSinkDataView data,
67 media_router::MediaSinkInternal* out) {
50 media_router::MediaSink::Id id; 68 media_router::MediaSink::Id id;
51 if (!data.ReadSinkId(&id)) 69 if (!data.ReadSinkId(&id) ||
70 !media_router::MediaSinkInternal::IsValidSinkId(id)) {
52 return false; 71 return false;
72 }
53 73
54 out->set_sink_id(id); 74 out->set_sink_id(id);
55 75
56 std::string name; 76 std::string name;
57 if (!data.ReadName(&name)) 77 if (!data.ReadName(&name))
58 return false; 78 return false;
59 79
60 out->set_name(name); 80 out->set_name(name);
61 81
62 base::Optional<std::string> description; 82 base::Optional<std::string> description;
63 if (!data.ReadDescription(&description)) 83 if (!data.ReadDescription(&description))
64 return false; 84 return false;
65 85
66 if (description) 86 if (description)
67 out->set_description(*description); 87 out->set_description(*description);
68 88
69 base::Optional<std::string> domain; 89 base::Optional<std::string> domain;
70 if (!data.ReadDomain(&domain)) 90 if (!data.ReadDomain(&domain))
71 return false; 91 return false;
72 92
73 if (domain) 93 if (domain)
74 out->set_domain(*domain); 94 out->set_domain(*domain);
75 95
76 media_router::MediaSink::IconType icon_type; 96 media_router::MediaSink::IconType icon_type;
77 if (!data.ReadIconType(&icon_type)) 97 if (!data.ReadIconType(&icon_type))
78 return false; 98 return false;
79 99
80 out->set_icon_type(icon_type); 100 out->set_icon_type(icon_type);
81 101
102 if (!data.ReadExtraData(out))
103 return false;
104
82 return true; 105 return true;
83 } 106 }
84 107
85 // static 108 // static
109 bool UnionTraits<media_router::mojom::MediaSinkExtraDataDataView,
110 media_router::MediaSinkInternal>::
111 Read(media_router::mojom::MediaSinkExtraDataDataView data,
112 media_router::MediaSinkInternal* out) {
113 switch (data.tag()) {
114 case media_router::mojom::MediaSinkExtraDataDataView::Tag::
115 DIAL_MEDIA_SINK: {
116 media_router::DialSinkExtraData extra_data;
117 if (!data.ReadDialMediaSink(&extra_data))
118 return false;
119 out->set_dial_data(extra_data);
120 return true;
121 }
122 case media_router::mojom::MediaSinkExtraDataDataView::Tag::
123 CAST_MEDIA_SINK: {
124 media_router::CastSinkExtraData extra_data;
125 if (!data.ReadCastMediaSink(&extra_data))
126 return false;
127 out->set_cast_data(extra_data);
128 return true;
129 }
130 }
131 NOTREACHED();
132 return false;
133 }
134
135 // static
136 bool StructTraits<media_router::mojom::DialMediaSinkDataView,
137 media_router::DialSinkExtraData>::
138 Read(media_router::mojom::DialMediaSinkDataView data,
139 media_router::DialSinkExtraData* out) {
140 if (!data.ReadIpAddress(&out->ip_address))
141 return false;
142
143 if (!data.ReadModelName(&out->model_name))
144 return false;
145
146 if (!data.ReadAppUrl(&out->app_url))
147 return false;
148
149 return true;
150 }
151
152 // static
153 bool StructTraits<media_router::mojom::CastMediaSinkDataView,
154 media_router::CastSinkExtraData>::
155 Read(media_router::mojom::CastMediaSinkDataView data,
156 media_router::CastSinkExtraData* out) {
157 if (!data.ReadIpAddress(&out->ip_address))
158 return false;
159
160 if (!data.ReadModelName(&out->model_name))
161 return false;
162
163 out->capabilities = data.capabilities();
164 out->cast_channel_id = data.cast_channel_id();
165
166 return true;
167 }
168
86 bool StructTraits<media_router::mojom::MediaRouteDataView, 169 bool StructTraits<media_router::mojom::MediaRouteDataView,
87 media_router::MediaRoute>:: 170 media_router::MediaRoute>::
88 Read(media_router::mojom::MediaRouteDataView data, 171 Read(media_router::mojom::MediaRouteDataView data,
89 media_router::MediaRoute* out) { 172 media_router::MediaRoute* out) {
90 media_router::MediaRoute::Id media_route_id; 173 media_router::MediaRoute::Id media_route_id;
91 if (!data.ReadMediaRouteId(&media_route_id)) 174 if (!data.ReadMediaRouteId(&media_route_id))
92 return false; 175 return false;
93 176
94 out->set_media_route_id(media_route_id); 177 out->set_media_route_id(media_route_id);
95 178
(...skipping 25 matching lines...) Expand all
121 204
122 out->set_local(data.is_local()); 205 out->set_local(data.is_local());
123 out->set_for_display(data.for_display()); 206 out->set_for_display(data.for_display());
124 out->set_incognito(data.is_incognito()); 207 out->set_incognito(data.is_incognito());
125 out->set_offscreen_presentation(data.is_offscreen_presentation()); 208 out->set_offscreen_presentation(data.is_offscreen_presentation());
126 209
127 return true; 210 return true;
128 } 211 }
129 212
130 } // namespace mojo 213 } // namespace mojo
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698