Revert 66214 - Display a warning when autofill is disabled for a website....

chrome/browser/autofill/form_structure.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/form_structure.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/sha1.h"
 #include "base/string_number_conversions.h"
@@ skipping 89 matching lines @@
     method_ = GET;
   }
 }
 
 FormStructure::~FormStructure() {}
 
 bool FormStructure::EncodeUploadRequest(bool auto_fill_used,
                                         std::string* encoded_xml) const {
   DCHECK(encoded_xml);
   encoded_xml->clear();
-  bool auto_fillable = IsAutoFillable(false);
+  bool auto_fillable = IsAutoFillable();
   DCHECK(auto_fillable);  // Caller should've checked for search pages.
   if (!auto_fillable)
     return false;
 
   buzz::XmlElement autofil_request_xml(buzz::QName("autofillupload"));
 
   // Attributes for the <autofillupload> element.
   //
   // TODO(jhawkins): Work with toolbar devs to make a spec for autofill clients.
   // For now these values are hacked from the toolbar code.
@@ skipping 104 matching lines @@
       AutoFillType autofill_type((*field)->type());
       if (autofill_type.group() == AutoFillType::CREDIT_CARD)
         form->has_credit_card_field_ = true;
       if (autofill_type.field_type() != UNKNOWN_TYPE)
         form->has_autofillable_field_ = true;
       ++current_type;
     }
 
     form->UpdateAutoFillCount();
   }
+
+  return;
 }
 
 std::string FormStructure::FormSignature() const {
   std::string form_string = target_url_.scheme() +
                             "://" +
                             target_url_.host() +
                             "&" +
                             UTF16ToUTF8(form_name_) +
                             form_signature_field_names_;
 
   return Hash64Bit(form_string);
 }
 
-bool FormStructure::IsAutoFillable(bool require_method_post) const {
+bool FormStructure::IsAutoFillable() const {
   if (autofill_count() < kRequiredFillableFields)
     return false;
 
-  return ShouldBeParsed(require_method_post);
+  return ShouldBeParsed();
 }
 
 bool FormStructure::HasAutoFillableValues() const {
   if (autofill_count_ == 0)
     return false;
 
   for (std::vector<AutoFillField*>::const_iterator iter = begin();
        iter != end(); ++iter) {
     AutoFillField* field = *iter;
     if (field && !field->IsEmpty() && field->IsFieldFillable())
       return true;
   }
 
   return false;
 }
 
+// TODO(jhawkins): Cache this result.
+bool FormStructure::HasBillingFields() const {
+  for (std::vector<AutoFillField*>::const_iterator iter = begin();
+       iter != end(); ++iter) {
+    if (!*iter)
+      return false;
+
+    AutoFillField* field = *iter;
+    if (!field)
+      continue;
+
+    AutoFillType type(field->type());
+    if (type.group() == AutoFillType::ADDRESS_BILLING ||
+        type.group() == AutoFillType::CREDIT_CARD)
+      return true;
+  }
+
+  return false;
+}
+
+// TODO(jhawkins): Cache this result.
+bool FormStructure::HasNonBillingFields() const {
+  for (std::vector<AutoFillField*>::const_iterator iter = begin();
+       iter != end(); ++iter) {
+    if (!*iter)
+      return false;
+
+    AutoFillField* field = *iter;
+    if (!field)
+      continue;
+
+    AutoFillType type(field->type());
+    if (type.group() != AutoFillType::ADDRESS_BILLING &&
+        type.group() != AutoFillType::CREDIT_CARD)
+      return true;
+  }
+
+  return false;
+}
+
 void FormStructure::UpdateAutoFillCount() {
   autofill_count_ = 0;
   for (std::vector<AutoFillField*>::const_iterator iter = begin();
        iter != end(); ++iter) {
     AutoFillField* field = *iter;
     if (field && field->IsFieldFillable())
       ++autofill_count_;
   }
 }
 
-bool FormStructure::ShouldBeParsed(bool require_method_post) const {
+bool FormStructure::ShouldBeParsed() const {
   if (field_count() < kRequiredFillableFields)
     return false;
 
   // Rule out http(s)://*/search?...
   //  e.g. http://www.google.com/search?q=...
   //       http://search.yahoo.com/search?p=...
   if (target_url_.path() == "/search")
     return false;
 
-  return !require_method_post || (method_ == POST);
+  if (method_ == GET)
+    return false;
+
+  return true;
 }
 
 void FormStructure::set_possible_types(int index, const FieldTypeSet& types) {
   int num_fields = static_cast<int>(field_count());
   DCHECK(index >= 0 && index < num_fields);
   if (index >= 0 && index < num_fields)
     fields_[index]->set_possible_types(types);
 }
 
 const AutoFillField* FormStructure::field(int index) const {
@@ skipping 96 matching lines @@
     } else {
       buzz::XmlElement *field_element = new buzz::XmlElement(
           buzz::QName(kXMLElementField));
       field_element->SetAttr(buzz::QName(kAttributeSignature),
                              field->FieldSignature());
       encompassing_xml_element->AddElement(field_element);
     }
   }
   return true;
 }