| Index: webkit/glue/form_field.h
|
| ===================================================================
|
| --- webkit/glue/form_field.h (revision 77285)
|
| +++ webkit/glue/form_field.h (working copy)
|
| @@ -13,8 +13,7 @@
|
| namespace webkit_glue {
|
|
|
| // Stores information about a field in a form.
|
| -class FormField {
|
| - public:
|
| +struct FormField {
|
| FormField();
|
| explicit FormField(WebKit::WebFormControlElement element);
|
| FormField(const string16& label,
|
| @@ -25,31 +24,6 @@
|
| bool is_autofilled);
|
| virtual ~FormField();
|
|
|
| - const string16& label() const { return label_; }
|
| - const string16& name() const { return name_; }
|
| - const string16& value() const { return value_; }
|
| - const string16& form_control_type() const { return form_control_type_; }
|
| - int max_length() const { return max_length_; }
|
| - bool is_autofilled() const { return is_autofilled_; }
|
| -
|
| - // Returns option string for elements for which they make sense (select-one,
|
| - // for example) for the rest of elements return an empty array.
|
| - const std::vector<string16>& option_strings() const {
|
| - return option_strings_;
|
| - }
|
| -
|
| - void set_label(const string16& label) { label_ = label; }
|
| - void set_name(const string16& name) { name_ = name; }
|
| - void set_value(const string16& value) { value_ = value; }
|
| - void set_form_control_type(const string16& form_control_type) {
|
| - form_control_type_ = form_control_type;
|
| - }
|
| - void set_max_length(int max_length) { max_length_ = max_length; }
|
| - void set_autofilled(bool is_autofilled) { is_autofilled_ = is_autofilled; }
|
| - void set_option_strings(const std::vector<string16>& strings) {
|
| - option_strings_ = strings;
|
| - }
|
| -
|
| // Equality tests for identity which does not include |value_| or |size_|.
|
| // Use |StrictlyEqualsHack| method to test all members.
|
| // TODO(dhollowa): These operators need to be revised when we implement field
|
| @@ -61,14 +35,13 @@
|
| // TODO(dhollowa): This will be removed when we implement field ids.
|
| bool StrictlyEqualsHack(const FormField& field) const;
|
|
|
| - private:
|
| - string16 label_;
|
| - string16 name_;
|
| - string16 value_;
|
| - string16 form_control_type_;
|
| - int max_length_;
|
| - bool is_autofilled_;
|
| - std::vector<string16> option_strings_;
|
| + string16 label;
|
| + string16 name;
|
| + string16 value;
|
| + string16 form_control_type;
|
| + int max_length;
|
| + bool is_autofilled;
|
| + std::vector<string16> option_strings;
|
| };
|
|
|
| // So we can compare FormFields with EXPECT_EQ().
|
|
|