Make FormField be a struct rather than a class per c++ standards.

This makes automatic generation of IPC messages much easier.
Convert autofill messsage to automatic generation in the process.
Attempt #2: fix build on chromeos, see http://codereview.chromium.org/6633001
for original CL.

Review URL: http://codereview.chromium.org/6625087

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77307 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 35 deletions

diff --git a/webkit/glue/form_field.h b/webkit/glue/form_field.h
index 1874c44..c246091 100644
--- a/webkit/glue/form_field.h
+++ b/webkit/glue/form_field.h
@@ -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 @@ class FormField {
             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 @@ class FormField {
   // 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().