AutofillPopupController clarifications + simplifications.

chrome/browser/autofill/autofill_manager.cc

 // Copyright (c) 2012 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 <stddef.h>
 
 #include <limits>
 #include <map>
@@ skipping 45 matching lines @@
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
 #include "ipc/ipc_message_macros.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebAutofillClient.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFormElement.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/rect.h"
 
+typedef PersonalDataManager::GUIDPair GUIDPair;
 using base::TimeTicks;
 using content::BrowserThread;
 using content::RenderViewHost;
 
 namespace {
 
 const char* kAutofillManagerWebContentsUserDataKey = "web_contents_autofill";
 
 // We only send a fraction of the forms to upload server.
 // The rate for positive/negative matches potentially could be different.
@@ skipping 1046 matching lines @@
 }
 
 void AutofillManager::GetProfileSuggestions(
     FormStructure* form,
     const FormFieldData& field,
     AutofillFieldType type,
     std::vector<string16>* values,
     std::vector<string16>* labels,
     std::vector<string16>* icons,
     std::vector<int>* unique_ids) const {
-  const std::vector<AutofillProfile*>& profiles = personal_data_->GetProfiles();
-  const std::string app_locale = AutofillCountry::ApplicationLocale();
-  if (!field.is_autofilled) {
-    std::vector<AutofillProfile*> matched_profiles;
-    for (std::vector<AutofillProfile*>::const_iterator iter = profiles.begin();
-         iter != profiles.end(); ++iter) {
-      AutofillProfile* profile = *iter;
+  std::vector<AutofillFieldType> field_types(form->field_count());
+  for (size_t i = 0; i < form->field_count(); ++i) {
+    field_types[i] = form->field(i)->type();
+  }
+  std::vector<GUIDPair> guid_pairs;
 
-      // The value of the stored data for this field type in the |profile|.
-      std::vector<string16> multi_values;
-      profile->GetMultiInfo(type, app_locale, &multi_values);
+  personal_data_->GetProfileSuggestions(
+      type, field.value, field.is_autofilled, field_types,
+      values, labels, icons, &guid_pairs);
 
-      for (size_t i = 0; i < multi_values.size(); ++i) {
-        if (!multi_values[i].empty() &&
-            StartsWith(multi_values[i], field.value, false)) {
-          matched_profiles.push_back(profile);
-          values->push_back(multi_values[i]);
-          unique_ids->push_back(PackGUIDs(GUIDPair(std::string(), 0),
-                                          GUIDPair(profile->guid(), i)));
-        }
-      }
-    }
-
-    std::vector<AutofillFieldType> form_fields;
-    form_fields.reserve(form->field_count());
-    for (std::vector<AutofillField*>::const_iterator iter = form->begin();
-         iter != form->end(); ++iter) {
-      form_fields.push_back((*iter)->type());
-    }
-
-    AutofillProfile::CreateInferredLabels(&matched_profiles, &form_fields,
-                                          type, 1, labels);
-
-    // No icons for profile suggestions.
-    icons->resize(values->size());
-  } else {
-    for (std::vector<AutofillProfile*>::const_iterator iter = profiles.begin();
-         iter != profiles.end(); ++iter) {
-      AutofillProfile* profile = *iter;
-
-      // The value of the stored data for this field type in the |profile|.
-      std::vector<string16> multi_values;
-      profile->GetMultiInfo(type, app_locale, &multi_values);
-
-      for (size_t i = 0; i < multi_values.size(); ++i) {
-        if (multi_values[i].empty())
-          continue;
-        string16 profile_value_lower_case(StringToLowerASCII(multi_values[i]));
-        string16 field_value_lower_case(StringToLowerASCII(field.value));
-        // Phone numbers could be split in US forms, so field value could be
-        // either prefix or suffix of the phone.
-        bool matched_phones = false;
-        if (type == PHONE_HOME_NUMBER && !field_value_lower_case.empty() &&
-            (profile_value_lower_case.find(field_value_lower_case) !=
-             string16::npos)) {
-          matched_phones = true;
-        }
-        if (matched_phones ||
-            profile_value_lower_case == field_value_lower_case) {
-          for (size_t j = 0; j < multi_values.size(); ++j) {
-            if (!multi_values[j].empty()) {
-              values->push_back(multi_values[j]);
-              unique_ids->push_back(PackGUIDs(GUIDPair(std::string(), 0),
-                                              GUIDPair(profile->guid(), j)));
-            }
-          }
-          // We've added all the values for this profile so move on to the next.
-          break;
-        }
-      }
-    }
-
-    // No labels for previously filled fields.
-    labels->resize(values->size());
-
-    // No icons for profile suggestions.
-    icons->resize(values->size());
+  for (size_t i = 0; i < guid_pairs.size(); ++i) {
+    unique_ids->push_back(PackGUIDs(GUIDPair(std::string(), 0),
+                                    guid_pairs[i]));

[Ilya Sherman, 2012/12/20 21:57:42]

This diff is not related to this CL...

   }
 }
 
 void AutofillManager::GetCreditCardSuggestions(
     FormStructure* form,
     const FormFieldData& field,
     AutofillFieldType type,
     std::vector<string16>* values,
     std::vector<string16>* labels,
     std::vector<string16>* icons,
@@ skipping 76 matching lines @@
   if (iter == guid_id_map_.end()) {
     int id = guid_id_map_.size() + 1;
     guid_id_map_[guid] = id;
     id_guid_map_[id] = guid;
     return id;
   } else {
     return iter->second;
   }
 }
 
-const AutofillManager::GUIDPair AutofillManager::IDToGUID(int id) const {
+const GUIDPair AutofillManager::IDToGUID(int id) const {
   if (id == 0)
     return GUIDPair(std::string(), 0);
 
   std::map<int, GUIDPair>::const_iterator iter = id_guid_map_.find(id);
   if (iter == id_guid_map_.end()) {
     NOTREACHED();
     return GUIDPair(std::string(), 0);
   }
 
   return iter->second;
@@ skipping 27 matching lines @@
   *profile_guid = IDToGUID(profile_id);
 }
 
 void AutofillManager::UpdateInitialInteractionTimestamp(
     const TimeTicks& interaction_timestamp) {
   if (initial_interaction_timestamp_.is_null() ||
       interaction_timestamp < initial_interaction_timestamp_) {
     initial_interaction_timestamp_ = interaction_timestamp;
   }
 }