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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: mojo/converters/ime/ime_type_converters.cc

Issue 1543603002: Switch to standard integer types in mojo/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 4 years, 12 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
« no previous file with comments | « mojo/common/weak_interface_ptr_set.h ('k') | mojo/converters/input_events/input_events_type_converters.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "mojo/converters/ime/ime_type_converters.h" 5 #include "mojo/converters/ime/ime_type_converters.h"
6 6
7 #include "base/basictypes.h" 7 #include <stdint.h>
8
8 #include "base/macros.h" 9 #include "base/macros.h"
9 10
10 namespace mojo { 11 namespace mojo {
11 12
12 #define TEXT_INPUT_TYPE_ASSERT(NAME) \ 13 #define TEXT_INPUT_TYPE_ASSERT(NAME) \
13 static_assert(static_cast<int32>(TEXT_INPUT_TYPE_##NAME) == \ 14 static_assert(static_cast<int32_t>(TEXT_INPUT_TYPE_##NAME) == \
14 static_cast<int32>(ui::TEXT_INPUT_TYPE_##NAME), \ 15 static_cast<int32_t>(ui::TEXT_INPUT_TYPE_##NAME), \
15 "TEXT_INPUT_TYPE must match") 16 "TEXT_INPUT_TYPE must match")
16 TEXT_INPUT_TYPE_ASSERT(NONE); 17 TEXT_INPUT_TYPE_ASSERT(NONE);
17 TEXT_INPUT_TYPE_ASSERT(TEXT); 18 TEXT_INPUT_TYPE_ASSERT(TEXT);
18 TEXT_INPUT_TYPE_ASSERT(PASSWORD); 19 TEXT_INPUT_TYPE_ASSERT(PASSWORD);
19 TEXT_INPUT_TYPE_ASSERT(SEARCH); 20 TEXT_INPUT_TYPE_ASSERT(SEARCH);
20 TEXT_INPUT_TYPE_ASSERT(EMAIL); 21 TEXT_INPUT_TYPE_ASSERT(EMAIL);
21 TEXT_INPUT_TYPE_ASSERT(NUMBER); 22 TEXT_INPUT_TYPE_ASSERT(NUMBER);
22 TEXT_INPUT_TYPE_ASSERT(TELEPHONE); 23 TEXT_INPUT_TYPE_ASSERT(TELEPHONE);
23 TEXT_INPUT_TYPE_ASSERT(URL); 24 TEXT_INPUT_TYPE_ASSERT(URL);
24 TEXT_INPUT_TYPE_ASSERT(DATE); 25 TEXT_INPUT_TYPE_ASSERT(DATE);
25 TEXT_INPUT_TYPE_ASSERT(DATE_TIME); 26 TEXT_INPUT_TYPE_ASSERT(DATE_TIME);
26 TEXT_INPUT_TYPE_ASSERT(DATE_TIME_LOCAL); 27 TEXT_INPUT_TYPE_ASSERT(DATE_TIME_LOCAL);
27 TEXT_INPUT_TYPE_ASSERT(MONTH); 28 TEXT_INPUT_TYPE_ASSERT(MONTH);
28 TEXT_INPUT_TYPE_ASSERT(TIME); 29 TEXT_INPUT_TYPE_ASSERT(TIME);
29 TEXT_INPUT_TYPE_ASSERT(WEEK); 30 TEXT_INPUT_TYPE_ASSERT(WEEK);
30 TEXT_INPUT_TYPE_ASSERT(TEXT_AREA); 31 TEXT_INPUT_TYPE_ASSERT(TEXT_AREA);
31 32
32 #define TEXT_INPUT_FLAG_ASSERT(NAME) \ 33 #define TEXT_INPUT_FLAG_ASSERT(NAME) \
33 static_assert(static_cast<int32>(TEXT_INPUT_FLAG_##NAME) == \ 34 static_assert(static_cast<int32_t>(TEXT_INPUT_FLAG_##NAME) == \
34 static_cast<int32>(ui::TEXT_INPUT_FLAG_##NAME), \ 35 static_cast<int32_t>(ui::TEXT_INPUT_FLAG_##NAME), \
35 "TEXT_INPUT_FLAG must match") 36 "TEXT_INPUT_FLAG must match")
36 TEXT_INPUT_FLAG_ASSERT(NONE); 37 TEXT_INPUT_FLAG_ASSERT(NONE);
37 TEXT_INPUT_FLAG_ASSERT(AUTOCOMPLETE_ON); 38 TEXT_INPUT_FLAG_ASSERT(AUTOCOMPLETE_ON);
38 TEXT_INPUT_FLAG_ASSERT(AUTOCOMPLETE_OFF); 39 TEXT_INPUT_FLAG_ASSERT(AUTOCOMPLETE_OFF);
39 TEXT_INPUT_FLAG_ASSERT(AUTOCORRECT_ON); 40 TEXT_INPUT_FLAG_ASSERT(AUTOCORRECT_ON);
40 TEXT_INPUT_FLAG_ASSERT(AUTOCORRECT_OFF); 41 TEXT_INPUT_FLAG_ASSERT(AUTOCORRECT_OFF);
41 TEXT_INPUT_FLAG_ASSERT(SPELLCHECK_ON); 42 TEXT_INPUT_FLAG_ASSERT(SPELLCHECK_ON);
42 TEXT_INPUT_FLAG_ASSERT(SPELLCHECK_OFF); 43 TEXT_INPUT_FLAG_ASSERT(SPELLCHECK_OFF);
43 TEXT_INPUT_FLAG_ASSERT(AUTOCAPITALIZE_NONE); 44 TEXT_INPUT_FLAG_ASSERT(AUTOCAPITALIZE_NONE);
44 TEXT_INPUT_FLAG_ASSERT(AUTOCAPITALIZE_CHARACTERS); 45 TEXT_INPUT_FLAG_ASSERT(AUTOCAPITALIZE_CHARACTERS);
(...skipping 20 matching lines...) Expand all
65 input->flags, 66 input->flags,
66 input->text.To<std::string>(), 67 input->text.To<std::string>(),
67 input->selection_start, 68 input->selection_start,
68 input->selection_end, 69 input->selection_end,
69 input->composition_start, 70 input->composition_start,
70 input->composition_end, 71 input->composition_end,
71 input->can_compose_inline); 72 input->can_compose_inline);
72 } 73 }
73 74
74 } // namespace mojo 75 } // namespace mojo
OLDNEW
« no previous file with comments | « mojo/common/weak_interface_ptr_set.h ('k') | mojo/converters/input_events/input_events_type_converters.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698