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

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

Issue 2675033002: [Media Router] Add MediaSink subtypes (Closed)
Patch Set: Created 3 years, 10 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 #include "url/mojo/url_gurl_struct_traits.h"
6 7
7 namespace mojo { 8 namespace mojo {
8 9
9 // static 10 // static
10 bool StructTraits<media_router::mojom::IssueDataView, media_router::IssueInfo>:: 11 bool StructTraits<media_router::mojom::IssueDataView, media_router::IssueInfo>::
11 Read(media_router::mojom::IssueDataView data, 12 Read(media_router::mojom::IssueDataView data,
12 media_router::IssueInfo* out) { 13 media_router::IssueInfo* out) {
13 if (!data.ReadTitle(&out->title)) 14 if (!data.ReadTitle(&out->title))
14 return false; 15 return false;
15 16
(...skipping 17 matching lines...) Expand all
33 return false; 34 return false;
34 35
35 out->route_id = route_id.value_or(std::string()); 36 out->route_id = route_id.value_or(std::string());
36 37
37 out->is_blocking = data.is_blocking(); 38 out->is_blocking = data.is_blocking();
38 out->help_page_id = data.help_page_id(); 39 out->help_page_id = data.help_page_id();
39 40
40 return true; 41 return true;
41 } 42 }
42 43
44 // static
45 bool StructTraits<media_router::mojom::MediaSinkDataView,
46 std::unique_ptr<media_router::MediaSink>>::
47 Read(media_router::mojom::MediaSinkDataView data,
48 std::unique_ptr<media_router::MediaSink>* out) {
49 media_router::MediaSink::Id id;
50 if (!data.ReadSinkId(&id))
51 return false;
52
53 std::string name;
54 if (!data.ReadName(&name))
55 return false;
56
57 media_router::MediaSink::IconType icon_type;
58 if (!data.ReadIconType(&icon_type))
59 return false;
60
61 media_router::MediaSink* sink = nullptr;
dcheng 2017/02/05 09:23:00 Make this a std::unique_ptr (the early returns wil
zhaobin 2017/02/06 19:37:10 Done.
62 media_router::mojom::MediaSinkExtraDataDataView extra_data_data_view;
63 data.GetExtraDataDataView(&extra_data_data_view);
64
65 if (extra_data_data_view.is_null()) {
66 sink = new media_router::MediaSink(id, name, icon_type);
67 } else if (extra_data_data_view.is_dial_media_sink()) {
68 sink = new media_router::DialMediaSink(id, name, icon_type);
69 if (!extra_data_data_view.ReadDialMediaSink(sink))
70 return false;
71 } else if (extra_data_data_view.is_cast_media_sink()) {
72 sink = new media_router::CastMediaSink(id, name, icon_type);
73 if (!extra_data_data_view.ReadCastMediaSink(sink))
74 return false;
75 }
76
77 base::Optional<std::string> description;
78 if (!data.ReadDescription(&description))
79 return false;
80
81 sink->set_description(description.value_or(std::string()));
82
83 base::Optional<std::string> domain;
84 if (!data.ReadDomain(&domain))
85 return false;
86
87 if (domain)
88 sink->set_domain(*domain);
89
90 base::Optional<std::string> model_name;
91 if (!data.ReadModelName(&model_name))
92 return false;
93
94 if (model_name)
95 sink->set_model_name(*model_name);
96
97 *out = base::WrapUnique(sink);
98 return true;
99 }
100
101 // static
102 bool StructTraits<media_router::mojom::DialMediaSinkDataView,
103 media_router::MediaSink>::
104 Read(media_router::mojom::DialMediaSinkDataView data,
105 media_router::MediaSink* out) {
106 auto* dial_sink = media_router::DialMediaSink::Cast(out);
107
108 std::string ip_address;
109 if (!data.ReadIpAddress(&ip_address))
110 return false;
111 dial_sink->set_ip_address(ip_address);
112
113 GURL url;
114 if (!data.ReadAppUrl(&url))
115 return false;
116 dial_sink->set_app_url(url);
117
118 return true;
119 }
120
121 // static
122 bool StructTraits<media_router::mojom::CastMediaSinkDataView,
123 media_router::MediaSink>::
124 Read(media_router::mojom::CastMediaSinkDataView data,
125 media_router::MediaSink* out) {
126 auto* cast_sink = media_router::CastMediaSink::Cast(out);
127
128 cast_sink->set_capabilities(data.capabilities());
129
130 std::string ip_address;
131 if (!data.ReadIpAddress(&ip_address))
132 return false;
133 cast_sink->set_ip_address(ip_address);
134
135 cast_sink->set_cast_channel_id(data.cast_channel_id());
136
137 return true;
138 }
139
43 } // namespace mojo 140 } // namespace mojo
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698