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

chrome/browser/renderer_host/render_view_host_delegate.h

Index: chrome/browser/renderer_host/render_view_host_delegate.h
===================================================================
--- chrome/browser/renderer_host/render_view_host_delegate.h	(revision 66219)
+++ chrome/browser/renderer_host/render_view_host_delegate.h	(working copy)
@@ -521,7 +521,10 @@
     // 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
@@ -546,13 +549,13 @@
     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
Property changes on: chrome/browser/renderer_host/render_view_host_delegate.h
___________________________________________________________________
Deleted: svn:mergeinfo