OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 #ifndef CHROME_COMMON_FORM_FIELD_DATA_H_ | 5 #ifndef CHROME_COMMON_FORM_FIELD_DATA_H_ |
6 #define CHROME_COMMON_FORM_FIELD_DATA_H_ | 6 #define CHROME_COMMON_FORM_FIELD_DATA_H_ |
7 | 7 |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/string16.h" | 10 #include "base/string16.h" |
(...skipping 12 matching lines...) Expand all Loading... |
23 // Comparsion operator exposed for STL map. Uses label, then name to sort. | 23 // Comparsion operator exposed for STL map. Uses label, then name to sort. |
24 bool operator<(const FormFieldData& field) const; | 24 bool operator<(const FormFieldData& field) const; |
25 | 25 |
26 string16 label; | 26 string16 label; |
27 string16 name; | 27 string16 name; |
28 string16 value; | 28 string16 value; |
29 std::string form_control_type; | 29 std::string form_control_type; |
30 std::string autocomplete_attribute; | 30 std::string autocomplete_attribute; |
31 size_t max_length; | 31 size_t max_length; |
32 bool is_autofilled; | 32 bool is_autofilled; |
| 33 bool is_checked; |
| 34 bool is_checkable; |
33 bool is_focusable; | 35 bool is_focusable; |
34 bool should_autocomplete; | 36 bool should_autocomplete; |
35 | 37 |
36 // For the HTML snippet |<option value="US">United States</option>|, the | 38 // For the HTML snippet |<option value="US">United States</option>|, the |
37 // value is "US" and the contents are "United States". | 39 // value is "US" and the contents are "United States". |
38 std::vector<string16> option_values; | 40 std::vector<string16> option_values; |
39 std::vector<string16> option_contents; | 41 std::vector<string16> option_contents; |
40 }; | 42 }; |
41 | 43 |
42 // So we can compare FormFieldDatas with EXPECT_EQ(). | 44 // So we can compare FormFieldDatas with EXPECT_EQ(). |
43 std::ostream& operator<<(std::ostream& os, const FormFieldData& field); | 45 std::ostream& operator<<(std::ostream& os, const FormFieldData& field); |
44 | 46 |
45 // Prefer to use this macro in place of |EXPECT_EQ()| for comparing | 47 // Prefer to use this macro in place of |EXPECT_EQ()| for comparing |
46 // |FormFieldData|s in test code. | 48 // |FormFieldData|s in test code. |
47 #define EXPECT_FORM_FIELD_DATA_EQUALS(expected, actual) \ | 49 #define EXPECT_FORM_FIELD_DATA_EQUALS(expected, actual) \ |
48 do { \ | 50 do { \ |
49 EXPECT_EQ(expected.label, actual.label); \ | 51 EXPECT_EQ(expected.label, actual.label); \ |
50 EXPECT_EQ(expected.name, actual.name); \ | 52 EXPECT_EQ(expected.name, actual.name); \ |
51 EXPECT_EQ(expected.value, actual.value); \ | 53 EXPECT_EQ(expected.value, actual.value); \ |
52 EXPECT_EQ(expected.form_control_type, actual.form_control_type); \ | 54 EXPECT_EQ(expected.form_control_type, actual.form_control_type); \ |
53 EXPECT_EQ(expected.autocomplete_attribute, actual.autocomplete_attribute); \ | 55 EXPECT_EQ(expected.autocomplete_attribute, actual.autocomplete_attribute); \ |
54 EXPECT_EQ(expected.max_length, actual.max_length); \ | 56 EXPECT_EQ(expected.max_length, actual.max_length); \ |
55 EXPECT_EQ(expected.is_autofilled, actual.is_autofilled); \ | 57 EXPECT_EQ(expected.is_autofilled, actual.is_autofilled); \ |
| 58 EXPECT_EQ(expected.is_checked, actual.is_checked); \ |
| 59 EXPECT_EQ(expected.is_checkable, actual.is_checkable); \ |
56 } while (0) | 60 } while (0) |
57 | 61 |
58 #endif // CHROME_COMMON_FORM_FIELD_DATA_H_ | 62 #endif // CHROME_COMMON_FORM_FIELD_DATA_H_ |
OLD | NEW |