Fix for: Autofill on Windows does not work for the first autofillable page en...

chrome/browser/autofill/autofill_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/autofill/autofill_manager.h"
 
 #include <limits>
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 89 matching lines @@
     : tab_contents_(tab_contents),
       personal_data_(NULL),
       download_manager_(tab_contents_->profile()),
       disable_download_manager_requests_(false) {
   DCHECK(tab_contents);
 
   // |personal_data_| is NULL when using TestTabContents.
   personal_data_ =
       tab_contents_->profile()->GetOriginalProfile()->GetPersonalDataManager();
   download_manager_.SetObserver(this);
+  if (personal_data_)
+    personal_data_->SetObserver(this);
 }
 
 AutoFillManager::~AutoFillManager() {
   download_manager_.SetObserver(NULL);
+  if (personal_data_)
+    personal_data_->RemoveObserver(this);
 }
 
 // static
 void AutoFillManager::RegisterBrowserPrefs(PrefService* prefs) {
   prefs->RegisterDictionaryPref(prefs::kAutoFillDialogPlacement);
 }
 
 // static
 void AutoFillManager::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterBooleanPref(prefs::kAutoFillEnabled, true);
@@ skipping 28 matching lines @@
   // Determine the possible field types and upload the form structure to the
   // PersonalDataManager.
   DeterminePossibleFieldTypes(upload_form_structure_.get());
   HandleSubmit();
 }
 
 void AutoFillManager::FormsSeen(const std::vector<FormData>& forms) {
   if (!IsAutoFillEnabled())
     return;
 
+  if (!personal_data_->IsDataLoaded()) {
+    // Profile data is in the process of loading: delay parsing of the forms.
+    delayed_forms_.push_back(forms);
+    return;
+  }
+
   // No profiles or credit cards, no need to parse the forms.
   if (personal_data_->profiles().empty() &&
       personal_data_->credit_cards().empty())
     return;
 
   ParseForms(forms);
 }
 
 bool AutoFillManager::GetAutoFillSuggestions(int query_id,
                                              bool form_autofilled,
@@ skipping 224 matching lines @@
 void AutoFillManager::OnUploadedAutoFillHeuristics(
     const std::string& form_signature) {
 }
 
 void AutoFillManager::OnHeuristicsRequestError(
     const std::string& form_signature,
     AutoFillDownloadManager::AutoFillRequestType request_type,
     int http_error) {
 }
 
+void AutoFillManager::OnPersonalDataLoaded() {
+  DCHECK(personal_data_->IsDataLoaded());
+  while (!delayed_forms_.empty()) {
+    FormsSeen(delayed_forms_.front());
+    delayed_forms_.pop_front();
+  }
+}
+
 bool AutoFillManager::IsAutoFillEnabled() const {
   PrefService* prefs = tab_contents_->profile()->GetPrefs();
 
   // Migrate obsolete AutoFill pref.
   if (prefs->FindPreference(prefs::kFormAutofillEnabled)) {
     bool enabled = prefs->GetBoolean(prefs::kFormAutofillEnabled);
     prefs->ClearPref(prefs::kFormAutofillEnabled);
     prefs->SetBoolean(prefs::kAutoFillEnabled, enabled);
     return enabled;
   }
@@ skipping 54 matching lines @@
       disable_download_manager_requests_(false) {
 }
 
 AutoFillManager::AutoFillManager(TabContents* tab_contents,
                                  PersonalDataManager* personal_data)
     : tab_contents_(tab_contents),
       personal_data_(personal_data),
       download_manager_(NULL),
       disable_download_manager_requests_(false) {
   DCHECK(tab_contents);
+  if (personal_data_)
+    personal_data_->SetObserver(this);
 }
 
 void AutoFillManager::GetProfileSuggestions(FormStructure* form,
                                             const FormField& field,
                                             AutoFillType type,
                                             bool include_cc_labels,
                                             std::vector<string16>* values,
                                             std::vector<string16>* labels,
                                             std::vector<string16>* icons,
                                             std::vector<int>* unique_ids) {
@@ skipping 303 matching lines @@
 
 // When receiving IDs (across processes) from the renderer we unpack credit card
 // and profile IDs from a single integer.  Credit card IDs are stored in the
 // high word and profile IDs are stored in the low word.
 // static
 void AutoFillManager::UnpackIDs(int id, int* cc_id, int* profile_id) {
   *cc_id = id >> std::numeric_limits<unsigned short>::digits &
       std::numeric_limits<unsigned short>::max();
   *profile_id = id & std::numeric_limits<unsigned short>::max();
 }