AutoFill: Aggregate profile data. Remove the AutoFill InfoBar.

chrome/browser/autofill/address.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/address.h"
 
 #include "base/basictypes.h"
 #include "base/string_util.h"
 #include "chrome/browser/autofill/autofill_type.h"
 #include "chrome/browser/autofill/field_types.h"
@@ skipping 12 matching lines @@
   AutoFillType::ADDRESS_COUNTRY,
 };
 
 const int kAutoFillAddressLength = arraysize(kAutoFillAddressTypes);
 
 }  // namespace
 
 void Address::GetPossibleFieldTypes(const string16& text,
                                     FieldTypeSet* possible_types) const {
   DCHECK(possible_types);
-  if (!possible_types)
-    return;
 
   // If the text to match against the field types is empty, then no results will
   // match.
   if (text.empty())
     return;
 
   if (IsLine1(text))
     possible_types->insert(GetLine1Type());
 
   if (IsLine2(text))
     possible_types->insert(GetLine2Type());
 
   if (IsAptNum(text))
     possible_types->insert(GetAptNumType());
 
   if (IsCity(text))
     possible_types->insert(GetCityType());
 
   if (IsState(text))
     possible_types->insert(GetStateType());
 
   if (IsZipCode(text))
     possible_types->insert(GetZipCodeType());
 
   if (IsCountry(text))
     possible_types->insert(GetCountryType());
 }
 
+void Address::GetAvailableFieldTypes(FieldTypeSet* available_types) const {
+  DCHECK(available_types);
+
+  if (!line1().empty())
+    available_types->insert(GetLine1Type());
+
+  if (!line2().empty())
+    available_types->insert(GetLine2Type());
+
+  if (!apt_num().empty())
+    available_types->insert(GetAptNumType());
+
+  if (!city().empty())
+    available_types->insert(GetCityType());
+
+  if (!state().empty())
+    available_types->insert(GetStateType());
+
+  if (!zip_code().empty())
+    available_types->insert(GetZipCodeType());
+
+  if (!country().empty())
+    available_types->insert(GetCountryType());
+}
+
 void Address::FindInfoMatches(const AutoFillType& type,
                               const string16& info,
                               std::vector<string16>* matched_text) const {
   DCHECK(matched_text);
-  if (!matched_text)
-    return;
 
   string16 match;
   if (type.field_type() == UNKNOWN_TYPE) {
     for (int i = 0; i < kAutoFillAddressLength; ++i) {
       if (FindInfoMatchesHelper(kAutoFillAddressTypes[i], info, &match))
         matched_text->push_back(match);
     }
   } else {
     if (FindInfoMatchesHelper(type.subgroup(), info, &match))
       matched_text->push_back(match);
@@ skipping 188 matching lines @@
 bool Address::IsWordInLine(const string16& word,
                            const LineTokens& line_tokens) const {
   LineTokens::const_iterator iter;
   for (iter = line_tokens.begin(); iter != line_tokens.end(); ++iter) {
     if (StringToLowerASCII(word) == *iter)
       return true;
   }
 
   return false;
 }