Show display warning if the form is autocomplete off.

chrome/renderer/autofill/autofill_agent.cc

 // Copyright (c) 2011 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/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/autofill_messages.h"
 #include "chrome/common/chrome_constants.h"
@@ skipping 216 matching lines @@
     web_view->hidePopups();
     return;
   }
 
   std::vector<string16> v(values);
   std::vector<string16> l(labels);
   std::vector<string16> i(icons);
   std::vector<int> ids(unique_ids);
   int separator_index = -1;
 
-  if (ids[0] < 0 && ids.size() > 1) {
+  if (display_warning_if_disabled_) {

[Ilya Sherman, 2011/07/26 09:01:55]

If display_warning_if_disabled_ is true, that does not mean that Autofill is
disabled.  I think the check you want here is something along the lines of

if (!autofill_query_node_.isNull() && !autofill_query_node_.autoComplete())

[honten.org, 2011/07/27 03:29:37]

I needed a couple of cast, so I made a function.

On 2011/07/26 09:01:55, Ilya Sherman wrote:

+    // If autofill is disabled and we had suggestions, show a warning instead.
+    v.assign(1,
+             l10n_util::GetStringUTF16(IDS_AUTOFILL_WARNING_FORM_DISABLED));
+    l.assign(1, string16());
+    i.assign(1, string16());
+    ids.assign(1, -1);
+  } else if (ids[0] < 0 && ids.size() > 1) {
     // If we received a warning instead of suggestions from autofill but regular
     // suggestions from autocomplete, don't show the autofill warning.
     v.erase(v.begin());
     l.erase(l.begin());
     i.erase(i.begin());
     ids.erase(ids.begin());
   }
 
   // If we were about to show a warning and we shouldn't, don't.
   if (ids[0] < 0 && !display_warning_if_disabled_)
@@ skipping 65 matching lines @@
     const std::vector<FormDataPredictions>& forms) {
   for (size_t i = 0; i < forms.size(); ++i) {
     form_manager_.ShowPredictions(forms[i]);
   }
 }
 
 void AutofillAgent::ShowSuggestions(const WebInputElement& element,
                                     bool autofill_on_empty_values,
                                     bool requires_caret_at_end,
                                     bool display_warning_if_disabled) {
-  if (!element.isEnabled() || element.isReadOnly() || !element.autoComplete() ||
+  const WebFormElement form = element.form();
+  if (!element.isEnabled() || element.isReadOnly() ||
+      (!element.autoComplete() && form.autoComplete()) ||
       !element.isTextField() || element.isPasswordField() ||
       !element.suggestedValue().isEmpty())
     return;
 
   // If the field has no name, then we won't have values.
   if (element.nameForAutofill().isEmpty())
     return;
 
   // Don't attempt to autofill with values that are too large.
   WebString value = element.value();
   if (value.length() > kMaximumTextSizeForAutofill)
     return;
 
   if (!autofill_on_empty_values && value.isEmpty())
     return;
 
   if (requires_caret_at_end &&
       (element.selectionStart() != element.selectionEnd() ||
        element.selectionEnd() != static_cast<int>(value.length())))
     return;
 
-  QueryAutofillSuggestions(element, display_warning_if_disabled);
+  QueryAutofillSuggestions(element,
+      display_warning_if_disabled && !form.autoComplete());

[Ilya Sherman, 2011/07/26 09:01:55]

Does this not prevent other warnings from ever displaying, e.g. the warning that
we show when trying to fill a credit card form on an HTTP (not HTTPS) website?

[honten.org, 2011/07/27 03:29:37]

I don't need this check anymore.

On 2011/07/26 09:01:55, Ilya Sherman wrote:
Done.

 }
 
 void AutofillAgent::QueryAutofillSuggestions(const WebNode& node,
                                              bool display_warning_if_disabled) {
   static int query_counter = 0;
   autofill_query_id_ = query_counter++;
   autofill_query_node_ = node;
   display_warning_if_disabled_ = display_warning_if_disabled;
 
   webkit_glue::FormData form;
@@ skipping 41 matching lines @@
   // WebFormControlElementToFormField does not scrape the DOM for the field
   // label, so find the label here.
   // TODO(isherman): Add form and field identities so we can use the cached form
   // data in FormManager.
   field->label = FormManager::LabelForElement(element);
 
   return true;
 }
 
 }  // namespace autofill