Set datapresent string to contain precisely those field types available in stored Autofill data.

chrome/browser/autofill/personal_data_manager.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/browser/autofill/personal_data_manager.h"
 
 #include <algorithm>
 #include <iterator>
 
 #include "base/logging.h"
@@ skipping 547 matching lines @@
 
 CreditCard* PersonalDataManager::GetCreditCardByGUID(const std::string& guid) {
   for (std::vector<CreditCard*>::iterator iter = credit_cards_.begin();
        iter != credit_cards_.end(); ++iter) {
     if ((*iter)->guid() == guid)
       return *iter;
   }
   return NULL;
 }
 
-void PersonalDataManager::GetPossibleFieldTypes(const string16& text,
-                                                FieldTypeSet* possible_types) {
+void PersonalDataManager::GetPossibleFieldTypes(
+    const string16& text,
+    FieldTypeSet* possible_types) const {
   string16 clean_info = StringToLowerASCII(CollapseWhitespace(text, false));
   if (clean_info.empty()) {
     possible_types->insert(EMPTY_TYPE);
     return;
   }
 
   const std::vector<AutofillProfile*>& profiles = this->profiles();
   for (std::vector<AutofillProfile*>::const_iterator iter = profiles.begin();
        iter != profiles.end(); ++iter) {
     const FormGroup* profile = *iter;
     if (!profile) {
       DLOG(ERROR) << "NULL information in profiles list";
       continue;
     }
 
     profile->GetPossibleFieldTypes(clean_info, possible_types);
   }
 
-  for (ScopedVector<CreditCard>::iterator iter = credit_cards_.begin();
+  for (ScopedVector<CreditCard>::const_iterator iter = credit_cards_.begin();
        iter != credit_cards_.end(); ++iter) {
     const FormGroup* credit_card = *iter;
     if (!credit_card) {
       DLOG(ERROR) << "NULL information in credit cards list";
       continue;
     }
 
     credit_card->GetPossibleFieldTypes(clean_info, possible_types);
   }
 
   if (possible_types->empty())
     possible_types->insert(UNKNOWN_TYPE);
 }
 
+void PersonalDataManager::GetAvailableFieldTypes(
+    FieldTypeSet* available_types) const {
+  const std::vector<AutofillProfile*>& profiles = this->profiles();
+  for (std::vector<AutofillProfile*>::const_iterator iter = profiles.begin();
+       iter != profiles.end(); ++iter) {
+    (*iter)->GetAvailableFieldTypes(available_types);
+  }
+
+  for (ScopedVector<CreditCard>::const_iterator iter = credit_cards_.begin();
+       iter != credit_cards_.end(); ++iter) {
+    (*iter)->GetAvailableFieldTypes(available_types);
+  }
+}
+
+

[dhollowa, 2011/05/06 03:06:20]

nit: remove extra line.

[Ilya Sherman, 2011/05/06 03:33:07]

Done.

 bool PersonalDataManager::HasPassword() {
   return !password_hash_.empty();
 }
 
 bool PersonalDataManager::IsDataLoaded() const {
   return is_data_loaded_;
 }
 
-const std::vector<AutofillProfile*>& PersonalDataManager::profiles() {
+const std::vector<AutofillProfile*>& PersonalDataManager::profiles() const {
   // |profile_| is NULL in AutofillManagerTest.
   bool auxiliary_profiles_enabled = profile_ ? profile_->GetPrefs()->GetBoolean(
       prefs::kAutofillAuxiliaryProfilesEnabled) : false;
   if (!auxiliary_profiles_enabled)
     return web_profiles();
 
 #if !defined(OS_MACOSX)
   NOTREACHED() << "Auxiliary profiles supported on Mac only";
 #endif
 
   profiles_.clear();
 
   // Populates |auxiliary_profiles_|.
   LoadAuxiliaryProfiles();
 
   profiles_.insert(profiles_.end(), web_profiles_.begin(), web_profiles_.end());
   profiles_.insert(profiles_.end(),
       auxiliary_profiles_.begin(), auxiliary_profiles_.end());
   return profiles_;
 }
 
-const std::vector<AutofillProfile*>& PersonalDataManager::web_profiles() {
+const std::vector<AutofillProfile*>& PersonalDataManager::web_profiles() const {
   return web_profiles_.get();
 }
 
-const std::vector<CreditCard*>& PersonalDataManager::credit_cards() {
+const std::vector<CreditCard*>& PersonalDataManager::credit_cards() const {
   return credit_cards_.get();
 }
 
 void PersonalDataManager::Refresh() {
   LoadProfiles();
   LoadCreditCards();
 }
 
 PersonalDataManager::PersonalDataManager()
     : profile_(NULL),
@@ skipping 108 matching lines @@
   }
 
   CancelPendingQuery(&pending_profiles_query_);
 
   pending_profiles_query_ = web_data_service->GetAutofillProfiles(this);
 }
 
 // Win and Linux implementations do nothing.  Mac implementation fills in the
 // contents of |auxiliary_profiles_|.
 #if !defined(OS_MACOSX)
-void PersonalDataManager::LoadAuxiliaryProfiles() {
+void PersonalDataManager::LoadAuxiliaryProfiles() const {
 }
 #endif
 
 void PersonalDataManager::LoadCreditCards() {
   WebDataService* web_data_service =
       profile_->GetWebDataService(Profile::EXPLICIT_ACCESS);
   if (!web_data_service) {
     NOTREACHED();
     return;
   }
@@ skipping 146 matching lines @@
 }
 
 const AutofillMetrics* PersonalDataManager::metric_logger() const {
   return metric_logger_.get();
 }
 
 void PersonalDataManager::set_metric_logger(
     const AutofillMetrics* metric_logger) {
   metric_logger_.reset(metric_logger);
 }