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

chrome/browser/renderer_host/render_view_host_delegate.h

 // 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.
 
 #ifndef CHROME_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_DELEGATE_H_
 #define CHROME_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_DELEGATE_H_
 #pragma once
 
 #include <string>
 #include <vector>
@@ skipping 503 matching lines @@
    public:
     // Forms fillable by Autocomplete have been detected in the page.
     virtual void FormSubmitted(const webkit_glue::FormData& form) = 0;
 
     // Called to retrieve a list of suggestions from the web database given
     // the name of the field |field_name| and what the user has already typed
     // in the field |user_text|.  Appeals to the database thread to perform the
     // query. When the database thread is finished, the AutocompleteHistory
     // manager retrieves the calling RenderViewHost and then passes the vector
     // of suggestions to RenderViewHost::AutocompleteSuggestionsReturned.
-    virtual void GetAutocompleteSuggestions(const string16& field_name,
+    // Returns true to indicate that FormFieldHistorySuggestionsReturned will be
+    // called.
+    virtual bool GetAutocompleteSuggestions(int query_id,
+                                            const string16& field_name,
                                             const string16& user_text) = 0;
 
     // Called when the user has indicated that she wants to remove the specified
     // Autocomplete suggestion from the database.
     virtual void RemoveAutocompleteEntry(const string16& field_name,
                                          const string16& value) = 0;
 
    protected:
     virtual ~Autocomplete() {}
   };
 
   // AutoFill ------------------------------------------------------------------
   // Interface for AutoFill-related functions.
 
   class AutoFill {
    public:
     // Called when the user submits a form.
     virtual void FormSubmitted(const webkit_glue::FormData& form) = 0;
 
     // Called when the frame has finished loading and there are forms in the
     // frame.
     virtual void FormsSeen(const std::vector<webkit_glue::FormData>& forms) = 0;
 
     // Called to retrieve a list of AutoFill suggestions from the web database
-    // given the name of the field, whether it is auto-filled, and what the user
-    // has already typed in it. If there is a warning to be returned to the
-    // user, it is stored into |values|, with corresponding unique id -1.
-    // Returns true to indicate that RenderViewHost::AutoFillSuggestionsReturned
-    // has been called.
+    // given the name of the field and what the user has already typed in the
+    // field. |form_autofilled| is true if the form containing |field| has any
+    // auto-filled fields. Returns true to indicate that
+    // RenderViewHost::AutoFillSuggestionsReturned has been called.
     virtual bool GetAutoFillSuggestions(
-        bool field_autofilled,
+        int query_id,
+        bool form_autofilled,
         const webkit_glue::FormField& field) = 0;
 
     // Called to fill the FormData object with AutoFill profile information that
     // matches the |value|, |unique_id| key. Returns true to indicate that
     // RenderViewHost::AutoFillFormDataFilled has been called.
     virtual bool FillAutoFillFormData(int query_id,
                                       const webkit_glue::FormData& form,
                                       int unique_id) = 0;
 
     // Called when the user selects the 'AutoFill Options...' suggestions in the
@@ skipping 289 matching lines @@
                                 bool remember) {}
 
   // Update the content restrictions, i.e. disable print/copy.
   virtual void UpdateContentRestrictions(int restrictions) {}
 
  protected:
   virtual ~RenderViewHostDelegate() {}
 };
 
 #endif  // CHROME_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_DELEGATE_H_