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

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

Issue 2666873006: [Media Router] Convert to use typemaps for media_router.mojom. (Closed)
Patch Set: Remove DCHECK since tests are hitting the code path 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 6
7 #include "chrome/browser/media/router/media_source.h"
8
7 namespace mojo { 9 namespace mojo {
8 10
9 // static 11 // static
10 bool StructTraits<media_router::mojom::IssueDataView, media_router::IssueInfo>:: 12 bool StructTraits<media_router::mojom::IssueDataView, media_router::IssueInfo>::
11 Read(media_router::mojom::IssueDataView data, 13 Read(media_router::mojom::IssueDataView data,
12 media_router::IssueInfo* out) { 14 media_router::IssueInfo* out) {
13 if (!data.ReadTitle(&out->title)) 15 if (!data.ReadTitle(&out->title))
14 return false; 16 return false;
15 17
16 if (!data.ReadDefaultAction(&out->default_action)) 18 if (!data.ReadDefaultAction(&out->default_action))
(...skipping 16 matching lines...) Expand all
33 return false; 35 return false;
34 36
35 out->route_id = route_id.value_or(std::string()); 37 out->route_id = route_id.value_or(std::string());
36 38
37 out->is_blocking = data.is_blocking(); 39 out->is_blocking = data.is_blocking();
38 out->help_page_id = data.help_page_id(); 40 out->help_page_id = data.help_page_id();
39 41
40 return true; 42 return true;
41 } 43 }
42 44
45 // static
46 bool StructTraits<
47 media_router::mojom::MediaSinkDataView,
48 media_router::MediaSink>::Read(media_router::mojom::MediaSinkDataView data,
49 media_router::MediaSink* out) {
50 media_router::MediaSink::Id id;
51 if (!data.ReadSinkId(&id))
52 return false;
53
54 out->set_sink_id(id);
55
56 std::string name;
57 if (!data.ReadName(&name))
58 return false;
59
60 out->set_name(name);
61
62 base::Optional<std::string> description;
63 if (!data.ReadDescription(&description))
64 return false;
65
66 if (description)
67 out->set_description(*description);
68
69 base::Optional<std::string> domain;
70 if (!data.ReadDomain(&domain))
71 return false;
72
73 if (domain)
74 out->set_domain(*domain);
75
76 media_router::MediaSink::IconType icon_type;
77 if (!data.ReadIconType(&icon_type))
78 return false;
79
80 out->set_icon_type(icon_type);
81
82 return true;
83 }
84
85 // static
86 bool StructTraits<media_router::mojom::MediaRouteDataView,
87 media_router::MediaRoute>::
88 Read(media_router::mojom::MediaRouteDataView data,
89 media_router::MediaRoute* out) {
90 media_router::MediaRoute::Id media_route_id;
91 if (!data.ReadMediaRouteId(&media_route_id))
92 return false;
93
94 out->set_media_route_id(media_route_id);
95
96 base::Optional<media_router::MediaSource::Id> media_source_id;
97 if (!data.ReadMediaSource(&media_source_id))
98 return false;
99
100 if (media_source_id)
101 out->set_media_source(media_router::MediaSource(*media_source_id));
102
103 media_router::MediaSink::Id media_sink_id;
104 if (!data.ReadMediaSinkId(&media_sink_id))
105 return false;
106
107 out->set_media_sink_id(media_sink_id);
108
109 std::string description;
110 if (!data.ReadDescription(&description))
111 return false;
112
113 out->set_description(description);
114
115 base::Optional<std::string> custom_controller_path;
116 if (!data.ReadCustomControllerPath(&custom_controller_path))
117 return false;
118
119 if (custom_controller_path)
120 out->set_custom_controller_path(*custom_controller_path);
121
122 out->set_local(data.is_local());
123 out->set_for_display(data.for_display());
124 out->set_incognito(data.is_incognito());
125 out->set_offscreen_presentation(data.is_offscreen_presentation());
126
127 return true;
128 }
129
43 } // namespace mojo 130 } // namespace mojo
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698