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

Side by Side Diff: services/ui/public/interfaces/ime/ime_struct_traits.cc

Issue 2843413002: Update Mus IME mojom and struct traits with new style enums and tests. (Closed)
Patch Set: Rebase. Created 3 years, 7 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 "services/ui/public/interfaces/ime/ime_struct_traits.h" 5 #include "services/ui/public/interfaces/ime/ime_struct_traits.h"
6 6
7 #include "ui/gfx/range/mojo/range_struct_traits.h" 7 #include "ui/gfx/range/mojo/range_struct_traits.h"
8 8
9 namespace mojo { 9 namespace mojo {
10 10
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 data.ReadUnderlines(&out->underlines) && 61 data.ReadUnderlines(&out->underlines) &&
62 data.ReadSelection(&out->selection); 62 data.ReadSelection(&out->selection);
63 } 63 }
64 64
65 // static 65 // static
66 ui::mojom::TextInputMode 66 ui::mojom::TextInputMode
67 EnumTraits<ui::mojom::TextInputMode, ui::TextInputMode>::ToMojom( 67 EnumTraits<ui::mojom::TextInputMode, ui::TextInputMode>::ToMojom(
68 ui::TextInputMode text_input_mode) { 68 ui::TextInputMode text_input_mode) {
69 switch (text_input_mode) { 69 switch (text_input_mode) {
70 case ui::TEXT_INPUT_MODE_DEFAULT: 70 case ui::TEXT_INPUT_MODE_DEFAULT:
71 return ui::mojom::TextInputMode::DEFAULT; 71 return ui::mojom::TextInputMode::kDefault;
72 case ui::TEXT_INPUT_MODE_VERBATIM: 72 case ui::TEXT_INPUT_MODE_VERBATIM:
73 return ui::mojom::TextInputMode::VERBATIM; 73 return ui::mojom::TextInputMode::kVerbatim;
74 case ui::TEXT_INPUT_MODE_LATIN: 74 case ui::TEXT_INPUT_MODE_LATIN:
75 return ui::mojom::TextInputMode::LATIN; 75 return ui::mojom::TextInputMode::kLatin;
76 case ui::TEXT_INPUT_MODE_LATIN_NAME: 76 case ui::TEXT_INPUT_MODE_LATIN_NAME:
77 return ui::mojom::TextInputMode::LATIN_NAME; 77 return ui::mojom::TextInputMode::kLatinName;
78 case ui::TEXT_INPUT_MODE_LATIN_PROSE: 78 case ui::TEXT_INPUT_MODE_LATIN_PROSE:
79 return ui::mojom::TextInputMode::LATIN_PROSE; 79 return ui::mojom::TextInputMode::kLatinProse;
80 case ui::TEXT_INPUT_MODE_FULL_WIDTH_LATIN: 80 case ui::TEXT_INPUT_MODE_FULL_WIDTH_LATIN:
81 return ui::mojom::TextInputMode::FULL_WIDTH_LATIN; 81 return ui::mojom::TextInputMode::kFullWidthLatin;
82 case ui::TEXT_INPUT_MODE_KANA: 82 case ui::TEXT_INPUT_MODE_KANA:
83 return ui::mojom::TextInputMode::KANA; 83 return ui::mojom::TextInputMode::kKana;
84 case ui::TEXT_INPUT_MODE_KANA_NAME: 84 case ui::TEXT_INPUT_MODE_KANA_NAME:
85 return ui::mojom::TextInputMode::KANA_NAME; 85 return ui::mojom::TextInputMode::kKanaName;
86 case ui::TEXT_INPUT_MODE_KATAKANA: 86 case ui::TEXT_INPUT_MODE_KATAKANA:
87 return ui::mojom::TextInputMode::KATAKANA; 87 return ui::mojom::TextInputMode::kKatakana;
88 case ui::TEXT_INPUT_MODE_NUMERIC: 88 case ui::TEXT_INPUT_MODE_NUMERIC:
89 return ui::mojom::TextInputMode::NUMERIC; 89 return ui::mojom::TextInputMode::kNumeric;
90 case ui::TEXT_INPUT_MODE_TEL: 90 case ui::TEXT_INPUT_MODE_TEL:
91 return ui::mojom::TextInputMode::TEL; 91 return ui::mojom::TextInputMode::kTel;
92 case ui::TEXT_INPUT_MODE_EMAIL: 92 case ui::TEXT_INPUT_MODE_EMAIL:
93 return ui::mojom::TextInputMode::EMAIL; 93 return ui::mojom::TextInputMode::kEmail;
94 case ui::TEXT_INPUT_MODE_URL: 94 case ui::TEXT_INPUT_MODE_URL:
95 return ui::mojom::TextInputMode::URL; 95 return ui::mojom::TextInputMode::kUrl;
96 } 96 }
97 NOTREACHED(); 97 NOTREACHED();
98 return ui::mojom::TextInputMode::DEFAULT; 98 return ui::mojom::TextInputMode::kDefault;
99 } 99 }
100 100
101 // static 101 // static
102 bool EnumTraits<ui::mojom::TextInputMode, ui::TextInputMode>::FromMojom( 102 bool EnumTraits<ui::mojom::TextInputMode, ui::TextInputMode>::FromMojom(
103 ui::mojom::TextInputMode input, 103 ui::mojom::TextInputMode input,
104 ui::TextInputMode* out) { 104 ui::TextInputMode* out) {
105 switch (input) { 105 switch (input) {
106 case ui::mojom::TextInputMode::DEFAULT: 106 case ui::mojom::TextInputMode::kDefault:
107 *out = ui::TEXT_INPUT_MODE_DEFAULT; 107 *out = ui::TEXT_INPUT_MODE_DEFAULT;
108 return true; 108 return true;
109 case ui::mojom::TextInputMode::VERBATIM: 109 case ui::mojom::TextInputMode::kVerbatim:
110 *out = ui::TEXT_INPUT_MODE_VERBATIM; 110 *out = ui::TEXT_INPUT_MODE_VERBATIM;
111 return true; 111 return true;
112 case ui::mojom::TextInputMode::LATIN: 112 case ui::mojom::TextInputMode::kLatin:
113 *out = ui::TEXT_INPUT_MODE_LATIN; 113 *out = ui::TEXT_INPUT_MODE_LATIN;
114 return true; 114 return true;
115 case ui::mojom::TextInputMode::LATIN_NAME: 115 case ui::mojom::TextInputMode::kLatinName:
116 *out = ui::TEXT_INPUT_MODE_LATIN_NAME; 116 *out = ui::TEXT_INPUT_MODE_LATIN_NAME;
117 return true; 117 return true;
118 case ui::mojom::TextInputMode::LATIN_PROSE: 118 case ui::mojom::TextInputMode::kLatinProse:
119 *out = ui::TEXT_INPUT_MODE_LATIN_PROSE; 119 *out = ui::TEXT_INPUT_MODE_LATIN_PROSE;
120 return true; 120 return true;
121 case ui::mojom::TextInputMode::FULL_WIDTH_LATIN: 121 case ui::mojom::TextInputMode::kFullWidthLatin:
122 *out = ui::TEXT_INPUT_MODE_FULL_WIDTH_LATIN; 122 *out = ui::TEXT_INPUT_MODE_FULL_WIDTH_LATIN;
123 return true; 123 return true;
124 case ui::mojom::TextInputMode::KANA: 124 case ui::mojom::TextInputMode::kKana:
125 *out = ui::TEXT_INPUT_MODE_KANA; 125 *out = ui::TEXT_INPUT_MODE_KANA;
126 return true; 126 return true;
127 case ui::mojom::TextInputMode::KANA_NAME: 127 case ui::mojom::TextInputMode::kKanaName:
128 *out = ui::TEXT_INPUT_MODE_KANA_NAME; 128 *out = ui::TEXT_INPUT_MODE_KANA_NAME;
129 return true; 129 return true;
130 case ui::mojom::TextInputMode::KATAKANA: 130 case ui::mojom::TextInputMode::kKatakana:
131 *out = ui::TEXT_INPUT_MODE_KATAKANA; 131 *out = ui::TEXT_INPUT_MODE_KATAKANA;
132 return true; 132 return true;
133 case ui::mojom::TextInputMode::NUMERIC: 133 case ui::mojom::TextInputMode::kNumeric:
134 *out = ui::TEXT_INPUT_MODE_NUMERIC; 134 *out = ui::TEXT_INPUT_MODE_NUMERIC;
135 return true; 135 return true;
136 case ui::mojom::TextInputMode::TEL: 136 case ui::mojom::TextInputMode::kTel:
137 *out = ui::TEXT_INPUT_MODE_TEL; 137 *out = ui::TEXT_INPUT_MODE_TEL;
138 return true; 138 return true;
139 case ui::mojom::TextInputMode::EMAIL: 139 case ui::mojom::TextInputMode::kEmail:
140 *out = ui::TEXT_INPUT_MODE_EMAIL; 140 *out = ui::TEXT_INPUT_MODE_EMAIL;
141 return true; 141 return true;
142 case ui::mojom::TextInputMode::URL: 142 case ui::mojom::TextInputMode::kUrl:
143 *out = ui::TEXT_INPUT_MODE_URL; 143 *out = ui::TEXT_INPUT_MODE_URL;
144 return true; 144 return true;
145 } 145 }
146 return false; 146 return false;
147 } 147 }
148 148
149 // static 149 // static
150 ui::mojom::TextInputType 150 ui::mojom::TextInputType
151 EnumTraits<ui::mojom::TextInputType, ui::TextInputType>::ToMojom( 151 EnumTraits<ui::mojom::TextInputType, ui::TextInputType>::ToMojom(
152 ui::TextInputType text_input_type) { 152 ui::TextInputType text_input_type) {
153 switch (text_input_type) { 153 switch (text_input_type) {
154 case ui::TEXT_INPUT_TYPE_NONE: 154 case ui::TEXT_INPUT_TYPE_NONE:
155 return ui::mojom::TextInputType::NONE; 155 return ui::mojom::TextInputType::kNone;
156 case ui::TEXT_INPUT_TYPE_TEXT: 156 case ui::TEXT_INPUT_TYPE_TEXT:
157 return ui::mojom::TextInputType::TEXT; 157 return ui::mojom::TextInputType::kText;
158 case ui::TEXT_INPUT_TYPE_PASSWORD: 158 case ui::TEXT_INPUT_TYPE_PASSWORD:
159 return ui::mojom::TextInputType::PASSWORD; 159 return ui::mojom::TextInputType::kPassword;
160 case ui::TEXT_INPUT_TYPE_SEARCH: 160 case ui::TEXT_INPUT_TYPE_SEARCH:
161 return ui::mojom::TextInputType::SEARCH; 161 return ui::mojom::TextInputType::kSearch;
162 case ui::TEXT_INPUT_TYPE_EMAIL: 162 case ui::TEXT_INPUT_TYPE_EMAIL:
163 return ui::mojom::TextInputType::EMAIL; 163 return ui::mojom::TextInputType::kEmail;
164 case ui::TEXT_INPUT_TYPE_NUMBER: 164 case ui::TEXT_INPUT_TYPE_NUMBER:
165 return ui::mojom::TextInputType::NUMBER; 165 return ui::mojom::TextInputType::kNumber;
166 case ui::TEXT_INPUT_TYPE_TELEPHONE: 166 case ui::TEXT_INPUT_TYPE_TELEPHONE:
167 return ui::mojom::TextInputType::TELEPHONE; 167 return ui::mojom::TextInputType::kTelephone;
168 case ui::TEXT_INPUT_TYPE_URL: 168 case ui::TEXT_INPUT_TYPE_URL:
169 return ui::mojom::TextInputType::URL; 169 return ui::mojom::TextInputType::kUrl;
170 case ui::TEXT_INPUT_TYPE_DATE: 170 case ui::TEXT_INPUT_TYPE_DATE:
171 return ui::mojom::TextInputType::DATE; 171 return ui::mojom::TextInputType::kDate;
172 case ui::TEXT_INPUT_TYPE_DATE_TIME: 172 case ui::TEXT_INPUT_TYPE_DATE_TIME:
173 return ui::mojom::TextInputType::DATETIME; 173 return ui::mojom::TextInputType::kDateTime;
174 case ui::TEXT_INPUT_TYPE_DATE_TIME_LOCAL: 174 case ui::TEXT_INPUT_TYPE_DATE_TIME_LOCAL:
175 return ui::mojom::TextInputType::DATETIME_LOCAL; 175 return ui::mojom::TextInputType::kDateTimeLocal;
176 case ui::TEXT_INPUT_TYPE_MONTH: 176 case ui::TEXT_INPUT_TYPE_MONTH:
177 return ui::mojom::TextInputType::MONTH; 177 return ui::mojom::TextInputType::kMonth;
178 case ui::TEXT_INPUT_TYPE_TIME: 178 case ui::TEXT_INPUT_TYPE_TIME:
179 return ui::mojom::TextInputType::TIME; 179 return ui::mojom::TextInputType::kTime;
180 case ui::TEXT_INPUT_TYPE_WEEK: 180 case ui::TEXT_INPUT_TYPE_WEEK:
181 return ui::mojom::TextInputType::WEEK; 181 return ui::mojom::TextInputType::kWeek;
182 case ui::TEXT_INPUT_TYPE_TEXT_AREA: 182 case ui::TEXT_INPUT_TYPE_TEXT_AREA:
183 return ui::mojom::TextInputType::TEXT_AREA; 183 return ui::mojom::TextInputType::kTextArea;
184 case ui::TEXT_INPUT_TYPE_CONTENT_EDITABLE: 184 case ui::TEXT_INPUT_TYPE_CONTENT_EDITABLE:
185 return ui::mojom::TextInputType::CONTENT_EDITABLE; 185 return ui::mojom::TextInputType::kContentEditable;
186 case ui::TEXT_INPUT_TYPE_DATE_TIME_FIELD: 186 case ui::TEXT_INPUT_TYPE_DATE_TIME_FIELD:
187 return ui::mojom::TextInputType::DATETIME_FIELD; 187 return ui::mojom::TextInputType::kDateTimeField;
188 } 188 }
189 NOTREACHED(); 189 NOTREACHED();
190 return ui::mojom::TextInputType::NONE; 190 return ui::mojom::TextInputType::kNone;
191 } 191 }
192 192
193 // static 193 // static
194 bool EnumTraits<ui::mojom::TextInputType, ui::TextInputType>::FromMojom( 194 bool EnumTraits<ui::mojom::TextInputType, ui::TextInputType>::FromMojom(
195 ui::mojom::TextInputType input, 195 ui::mojom::TextInputType input,
196 ui::TextInputType* out) { 196 ui::TextInputType* out) {
197 switch (input) { 197 switch (input) {
198 case ui::mojom::TextInputType::NONE: 198 case ui::mojom::TextInputType::kNone:
199 *out = ui::TEXT_INPUT_TYPE_NONE; 199 *out = ui::TEXT_INPUT_TYPE_NONE;
200 return true; 200 return true;
201 case ui::mojom::TextInputType::TEXT: 201 case ui::mojom::TextInputType::kText:
202 *out = ui::TEXT_INPUT_TYPE_TEXT; 202 *out = ui::TEXT_INPUT_TYPE_TEXT;
203 return true; 203 return true;
204 case ui::mojom::TextInputType::PASSWORD: 204 case ui::mojom::TextInputType::kPassword:
205 *out = ui::TEXT_INPUT_TYPE_PASSWORD; 205 *out = ui::TEXT_INPUT_TYPE_PASSWORD;
206 return true; 206 return true;
207 case ui::mojom::TextInputType::SEARCH: 207 case ui::mojom::TextInputType::kSearch:
208 *out = ui::TEXT_INPUT_TYPE_SEARCH; 208 *out = ui::TEXT_INPUT_TYPE_SEARCH;
209 return true; 209 return true;
210 case ui::mojom::TextInputType::EMAIL: 210 case ui::mojom::TextInputType::kEmail:
211 *out = ui::TEXT_INPUT_TYPE_EMAIL; 211 *out = ui::TEXT_INPUT_TYPE_EMAIL;
212 return true; 212 return true;
213 case ui::mojom::TextInputType::NUMBER: 213 case ui::mojom::TextInputType::kNumber:
214 *out = ui::TEXT_INPUT_TYPE_NUMBER; 214 *out = ui::TEXT_INPUT_TYPE_NUMBER;
215 return true; 215 return true;
216 case ui::mojom::TextInputType::TELEPHONE: 216 case ui::mojom::TextInputType::kTelephone:
217 *out = ui::TEXT_INPUT_TYPE_TELEPHONE; 217 *out = ui::TEXT_INPUT_TYPE_TELEPHONE;
218 return true; 218 return true;
219 case ui::mojom::TextInputType::URL: 219 case ui::mojom::TextInputType::kUrl:
220 *out = ui::TEXT_INPUT_TYPE_URL; 220 *out = ui::TEXT_INPUT_TYPE_URL;
221 return true; 221 return true;
222 case ui::mojom::TextInputType::DATE: 222 case ui::mojom::TextInputType::kDate:
223 *out = ui::TEXT_INPUT_TYPE_DATE; 223 *out = ui::TEXT_INPUT_TYPE_DATE;
224 return true; 224 return true;
225 case ui::mojom::TextInputType::DATETIME: 225 case ui::mojom::TextInputType::kDateTime:
226 *out = ui::TEXT_INPUT_TYPE_DATE_TIME; 226 *out = ui::TEXT_INPUT_TYPE_DATE_TIME;
227 return true; 227 return true;
228 case ui::mojom::TextInputType::DATETIME_LOCAL: 228 case ui::mojom::TextInputType::kDateTimeLocal:
229 *out = ui::TEXT_INPUT_TYPE_DATE_TIME_LOCAL; 229 *out = ui::TEXT_INPUT_TYPE_DATE_TIME_LOCAL;
230 return true; 230 return true;
231 case ui::mojom::TextInputType::MONTH: 231 case ui::mojom::TextInputType::kMonth:
232 *out = ui::TEXT_INPUT_TYPE_MONTH; 232 *out = ui::TEXT_INPUT_TYPE_MONTH;
233 return true; 233 return true;
234 case ui::mojom::TextInputType::TIME: 234 case ui::mojom::TextInputType::kTime:
235 *out = ui::TEXT_INPUT_TYPE_TIME; 235 *out = ui::TEXT_INPUT_TYPE_TIME;
236 return true; 236 return true;
237 case ui::mojom::TextInputType::WEEK: 237 case ui::mojom::TextInputType::kWeek:
238 *out = ui::TEXT_INPUT_TYPE_WEEK; 238 *out = ui::TEXT_INPUT_TYPE_WEEK;
239 return true; 239 return true;
240 case ui::mojom::TextInputType::TEXT_AREA: 240 case ui::mojom::TextInputType::kTextArea:
241 *out = ui::TEXT_INPUT_TYPE_TEXT_AREA; 241 *out = ui::TEXT_INPUT_TYPE_TEXT_AREA;
242 return true; 242 return true;
243 case ui::mojom::TextInputType::CONTENT_EDITABLE: 243 case ui::mojom::TextInputType::kContentEditable:
244 *out = ui::TEXT_INPUT_TYPE_CONTENT_EDITABLE; 244 *out = ui::TEXT_INPUT_TYPE_CONTENT_EDITABLE;
245 return true; 245 return true;
246 case ui::mojom::TextInputType::DATETIME_FIELD: 246 case ui::mojom::TextInputType::kDateTimeField:
247 *out = ui::TEXT_INPUT_TYPE_DATE_TIME_FIELD; 247 *out = ui::TEXT_INPUT_TYPE_DATE_TIME_FIELD;
248 return true; 248 return true;
249 } 249 }
250 return false; 250 return false;
251 } 251 }
252 252
253 } // namespace mojo 253 } // namespace mojo
OLDNEW
« no previous file with comments | « services/ui/public/interfaces/ime/ime.mojom ('k') | services/ui/public/interfaces/ime/ime_struct_traits_test.mojom » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698