[Autofill] Show a warning if the form disables Autofill.

chrome/renderer/autofill/autofill_agent.cc

 // Copyright (c) 2012 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/renderer/autofill/autofill_agent.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/string_split.h"
@@ skipping 582 matching lines @@
     // Any popup currently showing is obsolete.
     WebKit::WebView* web_view = render_view()->GetWebView();
     if (web_view)
       web_view->hidePopups();
 
     return;
   }
 
   element_ = element;
 
-  // If autocomplete is disabled at the form level, then we might want to show
-  // a warning in place of suggestions. However, if autocomplete is disabled
-  // specifically for this field, we never want to show a warning. Otherwise,
-  // we might interfere with custom popups (e.g. search suggestions) used by
-  // the website. Also, if the field has no name, then we won't have values.
-  const WebFormElement form = element.form();
-  if ((!element.autoComplete() && (form.isNull() || form.autoComplete())) ||
+  // If autocomplete is disabled at the form level, then we might want to show a
+  // warning in place of suggestions.  However, if autocomplete is disabled
+  // specifically for this field, we never want to show a warning.  Otherwise,
+  // we might interfere with custom popups (e.g. search suggestions) used by the
+  // website.  Note that we cannot use the WebKit method element.autoComplete()
+  // as it does not allow us to distinguish the case where autocomplete is
+  // disabled for *both* the element and for the form.
+  // Also, if the field has no name, then we won't have values.
+  if (element.getAttribute("autocomplete") == ASCIIToUTF16("off") ||

[Dan Beam, 2012/11/03 03:56:21]

does this need to be lowercased?

[Ilya Sherman, 2012/11/06 02:14:43]

Good call -- done.

       element.nameForAutofill().isEmpty()) {
     CombineDataListEntriesAndShow(element, std::vector<string16>(),
                                   std::vector<string16>(),
                                   std::vector<string16>(),
                                   std::vector<int>(), false);
     return;
   }
 
   QueryAutofillSuggestions(element, display_warning_if_disabled);
 }
 
 void AutofillAgent::QueryAutofillSuggestions(const WebInputElement& element,
                                              bool display_warning_if_disabled) {
   static int query_counter = 0;
   autofill_query_id_ = query_counter++;
   display_warning_if_disabled_ = display_warning_if_disabled;
 
+  // If autocomplete is disabled at the form level, we want to see if there
+  // would have been any suggestions were it enabled, so that we can show a
+  // warning.  Otherwise, we want to ignore fields that disable autocomplete, so
+  // that the suggestions list does not include suggestions for these form
+  // fields -- see comment 1 on http://crbug.com/69914
+  RequirementsMask requirements = REQUIRE_AUTOCOMPLETE;
+  const WebFormElement form_element = element.form();
+  if (!form_element.isNull() && !form_element.autoComplete())
+    requirements = REQUIRE_NONE;
+
   FormData form;
   FormFieldData field;
-  if (!FindFormAndFieldForInputElement(element, &form, &field,
-                                       REQUIRE_AUTOCOMPLETE)) {
+  if (!FindFormAndFieldForInputElement(element, &form, &field, requirements)) {
     // If we didn't find the cached form, at least let autocomplete have a shot
     // at providing suggestions.
     WebFormControlElementToFormField(element, EXTRACT_VALUE, &field);
   }
 
   gfx::Rect bounding_box(element_.boundsInViewportSpace());
 
   // Find the datalist values and send them to the browser process.
   std::vector<string16> data_list_values;
   std::vector<string16> data_list_labels;
@@ skipping 47 matching lines @@
 void AutofillAgent::SetNodeText(const string16& value,
                                 WebKit::WebInputElement* node) {
   did_set_node_text_ = true;
   string16 substring = value;
   substring = substring.substr(0, node->maxLength());
 
   node->setEditingValue(substring);
 }
 
 }  // namespace autofill