AutoFill: Aggregate profile data. Remove the AutoFill InfoBar.

chrome/browser/autofill/phone_number.cc

 // Copyright (c) 2010 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.
 
 #include "chrome/browser/autofill/phone_number.h"
 
 #include "base/basictypes.h"
 #include "base/string_util.h"
 #include "chrome/browser/autofill/autofill_profile.h"
 #include "chrome/browser/autofill/autofill_type.h"
@@ skipping 37 matching lines @@
   if (IsCountryCode(stripped_text))
     possible_types->insert(GetCountryCodeType());
 
   if (IsCityAndNumber(stripped_text))
     possible_types->insert(GetCityAndNumberType());
 
   if (IsWholeNumber(stripped_text))
     possible_types->insert(GetWholeNumberType());
 }
 
+void PhoneNumber::GetAvailableFieldTypes(FieldTypeSet* available_types) const {
+  DCHECK(available_types);
+
+  if (!number().empty())
+    available_types->insert(GetNumberType());
+
+  if (!city_code().empty())
+    available_types->insert(GetCityCodeType());
+
+  if (!country_code().empty())
+    available_types->insert(GetCountryCodeType());
+
+  if (!CityAndNumber().empty())
+    available_types->insert(GetCityAndNumberType());
+
+  if (!WholeNumber().empty())
+    available_types->insert(GetWholeNumberType());
+}
+
 string16 PhoneNumber::GetFieldText(const AutoFillType& type) const {
   AutoFillFieldType field_type = type.field_type();
   if (field_type == GetNumberType())
     return number();
 
   if (field_type == GetCityCodeType())
     return city_code();
 
   if (field_type == GetCountryCodeType())
     return country_code();
 
   if (field_type == GetCityAndNumberType())
     return CityAndNumber();
 
   if (field_type == GetWholeNumberType())
     return WholeNumber();
 
-  return EmptyString16();
+  return string16();
 }
 
 void PhoneNumber::FindInfoMatches(const AutoFillType& type,
                                   const string16& info,
                                   std::vector<string16>* matched_text) const {
   if (matched_text == NULL) {
     DLOG(ERROR) << "NULL matched vector passed in";
     return;
   }
 
@@ skipping 20 matching lines @@
   if (!Validate(number))
     return;
 
   FieldTypeSubGroup subgroup = type.subgroup();
   if (subgroup == AutoFillType::PHONE_NUMBER)
     set_number(number);
   else if (subgroup == AutoFillType::PHONE_CITY_CODE)
     set_city_code(number);
   else if (subgroup == AutoFillType::PHONE_COUNTRY_CODE)
     set_country_code(number);
-  else if (subgroup == AutoFillType::PHONE_WHOLE_NUMBER)
+  else if (subgroup == AutoFillType::PHONE_CITY_AND_NUMBER ||
+           subgroup == AutoFillType::PHONE_WHOLE_NUMBER)
     set_whole_number(number);
   else
     NOTREACHED();
 }
 
 // Static.
 bool PhoneNumber::ParsePhoneNumber(const string16& value,
                                    string16* number,
                                    string16* city_code,
                                    string16* country_code) {
@@ skipping 141 matching lines @@
       return false;
   }
 
   return true;
 }
 
 // Static.
 void PhoneNumber::StripPunctuation(string16* number) {
   RemoveChars(*number, kPhoneNumberSeparators, number);
 }