Fill in more name fields with requestAutocomplete

components/autofill/core/browser/contact_info.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_CONTACT_INFO_H_
 #define COMPONENTS_AUTOFILL_CORE_BROWSER_CONTACT_INFO_H_
 
 #include <vector>
 
 #include "base/compiler_specific.h"
@@ skipping 19 matching lines @@
   // FormGroup:
   virtual base::string16 GetRawInfo(ServerFieldType type) const OVERRIDE;
   virtual void SetRawInfo(ServerFieldType type,
                           const base::string16& value) OVERRIDE;
 
  private:
   // FormGroup:
   virtual void GetSupportedTypes(
       ServerFieldTypeSet* supported_types) const OVERRIDE;
 
-  // Returns the full name, which can include up to the first, middle, and last
-  // name.
+  // Returns the full name, which is either |full_|, or if |full_| is empty,
+  // is composed of given, middle and family.
   base::string16 FullName() const;
 
   // Returns the middle initial if |middle_| is non-empty.  Returns an empty
   // string otherwise.
   base::string16 MiddleInitial() const;
 
-  const base::string16& first() const { return first_; }
-  const base::string16& middle() const { return middle_; }
-  const base::string16& last() const { return last_; }
-
-  // Sets |first_|, |middle_|, and |last_| to the tokenized |full|.
-  // It is tokenized on a space only.
+  // Sets |given_|, |middle_|, and |family_| to the tokenized |full|.
   void SetFullName(const base::string16& full);
 
-  base::string16 first_;
+  base::string16 given_;
   base::string16 middle_;
-  base::string16 last_;
+  base::string16 family_;
+  base::string16 full_;
 };
 
 class EmailInfo : public FormGroup {
  public:
   EmailInfo();
   EmailInfo(const EmailInfo& info);
   virtual ~EmailInfo();
 
   EmailInfo& operator=(const EmailInfo& info);
 
@@ skipping 27 matching lines @@
   // FormGroup:
   virtual void GetSupportedTypes(
       ServerFieldTypeSet* supported_types) const OVERRIDE;
 
   base::string16 company_name_;
 };
 
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_CONTACT_INFO_H_