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

chrome/browser/autocomplete_history_manager.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/autocomplete_history_manager.h"
 
 #include <vector>
 
 #include "base/string16.h"
 #include "base/string_number_conversions.h"
@@ skipping 55 matching lines @@
                          &serial) || serial == 0)
     return false;
 
   return true;
 }
 
 }  // namespace
 
 AutocompleteHistoryManager::AutocompleteHistoryManager(
     TabContents* tab_contents) : tab_contents_(tab_contents),
-                                 pending_query_handle_(0) {
+                                 pending_query_handle_(0),
+                                 query_id_(0) {
   DCHECK(tab_contents);
 
   profile_ = tab_contents_->profile();
   DCHECK(profile_);
 
   web_data_service_ = profile_->GetWebDataService(Profile::EXPLICIT_ACCESS);
   DCHECK(web_data_service_);
 
   autofill_enabled_.Init(prefs::kAutoFillEnabled, profile_->GetPrefs(), NULL);
 }
 
 AutocompleteHistoryManager::~AutocompleteHistoryManager() {
   CancelPendingQuery();
 }
 
 void AutocompleteHistoryManager::FormSubmitted(const FormData& form) {
   StoreFormEntriesInWebDatabase(form);
 }
 
-void AutocompleteHistoryManager::GetAutocompleteSuggestions(
-    const string16& name, const string16& prefix) {
-  if (!*autofill_enabled_) {
-    SendSuggestions(NULL);
-    return;
-  }
+bool AutocompleteHistoryManager::GetAutocompleteSuggestions(
+    int query_id, const string16& name, const string16& prefix) {
+  if (!*autofill_enabled_)
+    return false;
 
   CancelPendingQuery();
 
+  query_id_ = query_id;
   pending_query_handle_ = web_data_service_->GetFormValuesForElementName(
       name, prefix, kMaxAutocompleteMenuItems, this);
+  return true;
 }
 
 void AutocompleteHistoryManager::RemoveAutocompleteEntry(
     const string16& name, const string16& value) {
   web_data_service_->RemoveFormValueForElementName(name, value);
 }
 
 void AutocompleteHistoryManager::OnWebDataServiceRequestDone(
     WebDataService::Handle h,
     const WDTypedResult* result) {
   DCHECK(pending_query_handle_);
   pending_query_handle_ = 0;
 
   if (*autofill_enabled_) {
     DCHECK(result);
     SendSuggestions(result);
   } else {
     SendSuggestions(NULL);
   }
 }
 
 AutocompleteHistoryManager::AutocompleteHistoryManager(
     Profile* profile, WebDataService* wds) : tab_contents_(NULL),
                                              profile_(profile),
                                              web_data_service_(wds),
-                                             pending_query_handle_(0) {
+                                             pending_query_handle_(0),
+                                             query_id_(0) {
   autofill_enabled_.Init(
       prefs::kAutoFillEnabled, profile_->GetPrefs(), NULL);
 }
 
 void AutocompleteHistoryManager::CancelPendingQuery() {
   if (pending_query_handle_) {
     SendSuggestions(NULL);
     web_data_service_->CancelRequest(pending_query_handle_);
   }
   pending_query_handle_ = 0;
@@ skipping 35 matching lines @@
 
 void AutocompleteHistoryManager::SendSuggestions(const WDTypedResult* result) {
   RenderViewHost* host = tab_contents_->render_view_host();
   if (!host)
     return;
 
   if (result) {
     DCHECK(result->GetType() == AUTOFILL_VALUE_RESULT);
     const WDResult<std::vector<string16> >* autofill_result =
         static_cast<const WDResult<std::vector<string16> >*>(result);
-    host->AutocompleteSuggestionsReturned(autofill_result->GetValue());
+    host->AutocompleteSuggestionsReturned(
+        query_id_, autofill_result->GetValue());
   } else {
-    host->AutocompleteSuggestionsReturned(std::vector<string16>());
+    host->AutocompleteSuggestionsReturned(
+        query_id_, std::vector<string16>());
   }
 }