summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-26 23:14:48 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-26 23:14:48 +0000
commit9a79fdb9a6e81e23b9852190f765b0ff4e2088c1 (patch)
tree1ab6883e14a06daf3f6d92d0005e77ea60b27809 /chrome/browser
parent6313d149ee2245d3a8048f05ee693adf0d59010a (diff)
downloadchromium_src-9a79fdb9a6e81e23b9852190f765b0ff4e2088c1.zip
chromium_src-9a79fdb9a6e81e23b9852190f765b0ff4e2088c1.tar.gz
chromium_src-9a79fdb9a6e81e23b9852190f765b0ff4e2088c1.tar.bz2
Imperative Autofill dialog first run flow:
on first run, instead of showing comboboxes, we will default fill the inputs with data drawn from Autofill. BUG=157270, 157273 Review URL: https://codereview.chromium.org/11415062 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@169527 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/ui/autofill/autofill_dialog_controller.cc91
-rw-r--r--chrome/browser/ui/autofill/autofill_dialog_controller.h10
-rw-r--r--chrome/browser/ui/views/autofill/autofill_dialog_views.cc3
3 files changed, 94 insertions, 10 deletions
diff --git a/chrome/browser/ui/autofill/autofill_dialog_controller.cc b/chrome/browser/ui/autofill/autofill_dialog_controller.cc
index 4fc2eec..638d3f7 100644
--- a/chrome/browser/ui/autofill/autofill_dialog_controller.cc
+++ b/chrome/browser/ui/autofill/autofill_dialog_controller.cc
@@ -45,13 +45,57 @@ void FilterInputs(const FormStructure& form_structure,
const DetailInput* input = &input_template[i];
for (size_t j = 0; j < form_structure.field_count(); ++j) {
if (DetailInputMatchesField(*input, *form_structure.field(j))) {
- inputs->push_back(input);
+ inputs->push_back(*input);
break;
}
}
}
}
+// Finds the instance of T which has the most data for filling in the inputs in
+// |all_inputs|. T should be a FormGroup type.
+template<class T> FormGroup* GetBestDataSource(
+ const std::vector<T*>& sources,
+ const DetailInputs* const* all_inputs,
+ size_t all_inputs_length) {
+ int best_field_fill_count = 0;
+ FormGroup* best_source = NULL;
+
+ for (size_t i = 0; i < sources.size(); ++i) {
+ int field_fill_count = 0;
+
+ for (size_t j = 0; j < all_inputs_length; ++j) {
+ const DetailInputs& inputs = *all_inputs[j];
+ for (size_t k = 0; k < inputs.size(); ++k) {
+ if (!sources[i]->GetCanonicalizedInfo(inputs[k].type).empty()) {
+ field_fill_count++;
+ }
+ }
+ }
+
+ // TODO(estade): should there be a better tiebreaker?
+ if (field_fill_count > best_field_fill_count) {
+ best_field_fill_count = field_fill_count;
+ best_source = sources[i];
+ }
+ }
+
+ return best_source;
+}
+
+// Uses |group| to fill in the |starting_value| for all inputs in |all_inputs|
+// (an out-param).
+void FillInputsFromFormGroup(FormGroup* group,
+ DetailInputs** all_inputs,
+ size_t all_inputs_length) {
+ for (size_t i = 0; i < all_inputs_length; ++i) {
+ DetailInputs& inputs = *all_inputs[i];
+ for (size_t j = 0; j < inputs.size(); ++j) {
+ inputs[j].starting_value = group->GetCanonicalizedInfo(inputs[j].type);
+ }
+ }
+}
+
} // namespace
AutofillDialogController::AutofillDialogController(
@@ -80,20 +124,20 @@ void AutofillDialogController::Show() {
return;
}
- static int row_id = 0;
+ int row_id = 0;
- static const DetailInput kEmailInputs[] = {
+ const DetailInput kEmailInputs[] = {
{ ++row_id, EMAIL_ADDRESS, "Email address" },
};
- static const DetailInput kCCInputs[] = {
+ const DetailInput kCCInputs[] = {
{ ++row_id, CREDIT_CARD_NUMBER, "Card number" },
{ ++row_id, CREDIT_CARD_EXP_2_DIGIT_YEAR, "Expiration MM/YY" },
{ row_id, CREDIT_CARD_VERIFICATION_CODE, "CVC" },
{ ++row_id, CREDIT_CARD_NAME, "Cardholder name" },
};
- static const DetailInput kBillingInputs[] = {
+ const DetailInput kBillingInputs[] = {
{ ++row_id, ADDRESS_HOME_LINE1, "Street address", "billing" },
{ ++row_id, ADDRESS_HOME_LINE2, "Street address (optional)", "billing" },
{ ++row_id, ADDRESS_HOME_CITY, "City", "billing" },
@@ -101,7 +145,7 @@ void AutofillDialogController::Show() {
{ row_id, ADDRESS_HOME_ZIP, "ZIP code", "billing", 0.5 },
};
- static const DetailInput kShippingInputs[] = {
+ const DetailInput kShippingInputs[] = {
{ ++row_id, NAME_FULL, "Full name", "shipping" },
{ ++row_id, ADDRESS_HOME_LINE1, "Street address", "shipping" },
{ ++row_id, ADDRESS_HOME_LINE2, "Street address (optional)", "shipping" },
@@ -130,7 +174,12 @@ void AutofillDialogController::Show() {
arraysize(kShippingInputs),
&requested_shipping_fields_);
- GenerateComboboxModels();
+ // TODO(estade): make this actually check if it's a first run.
+ bool first_run = true;
+ if (first_run)
+ PopulateInputsWithGuesses();
+ else
+ GenerateComboboxModels();
// TODO(estade): don't show the dialog if the site didn't specify the right
// fields. First we must figure out what the "right" fields are.
@@ -258,6 +307,32 @@ void AutofillDialogController::GenerateComboboxModels() {
suggested_shipping_.AddItem(ASCIIToUTF16("Enter new shipping"), "");
}
+void AutofillDialogController::PopulateInputsWithGuesses() {
+ PersonalDataManager* manager =
+ PersonalDataManagerFactory::GetForProfile(profile_);
+
+ DetailInputs* profile_inputs[] = { &requested_email_fields_,
+ &requested_billing_fields_ };
+ const std::vector<AutofillProfile*>& profiles = manager->profiles();
+ FormGroup* best_profile =
+ GetBestDataSource(profiles, profile_inputs, arraysize(profile_inputs));
+ if (best_profile) {
+ FillInputsFromFormGroup(best_profile,
+ profile_inputs,
+ arraysize(profile_inputs));
+ }
+
+ DetailInputs* cc_inputs[] = { &requested_cc_fields_ };
+ const std::vector<CreditCard*>& credit_cards = manager->credit_cards();
+ FormGroup* best_cc =
+ GetBestDataSource(credit_cards, cc_inputs, arraysize(cc_inputs));
+ if (best_cc) {
+ FillInputsFromFormGroup(best_cc,
+ cc_inputs,
+ arraysize(cc_inputs));
+ }
+}
+
void AutofillDialogController::FillOutputForSectionWithComparator(
DialogSection section, const InputFieldComparator& compare) {
int suggestion_selection = view_->GetSuggestionSelection(section);
@@ -278,7 +353,7 @@ void AutofillDialogController::FillOutputForSectionWithComparator(
// Only fill in data that is associated with this section.
const DetailInputs& inputs = RequestedFieldsForSection(section);
for (size_t j = 0; j < inputs.size(); ++j) {
- if (compare.Run(*inputs[j], *field)) {
+ if (compare.Run(inputs[j], *field)) {
form_group->FillFormField(*field, 0, field);
break;
}
diff --git a/chrome/browser/ui/autofill/autofill_dialog_controller.h b/chrome/browser/ui/autofill/autofill_dialog_controller.h
index 6846e4a..e6faaf0 100644
--- a/chrome/browser/ui/autofill/autofill_dialog_controller.h
+++ b/chrome/browser/ui/autofill/autofill_dialog_controller.h
@@ -41,6 +41,9 @@ struct DetailInput {
// A number between 0 and 1.0 that describes how much of the horizontal space
// in the row should be allotted to this input. 0 is equivalent to 1.
float expand_weight;
+ // When non-empty, indicates the value that should be pre-filled into the
+ // input.
+ string16 starting_value;
};
// Sections of the dialog --- all fields that may be shown to the user fit under
@@ -58,7 +61,7 @@ enum DialogAction {
ACTION_SUBMIT,
};
-typedef std::vector<const DetailInput*> DetailInputs;
+typedef std::vector<DetailInput> DetailInputs;
typedef std::map<const DetailInput*, string16> DetailOutputMap;
// This class drives the dialog that appears when a site uses the imperative
@@ -125,6 +128,11 @@ class AutofillDialogController {
// Initializes |suggested_email_| et al.
void GenerateComboboxModels();
+ // Fills in all the DetailInputs structs with guessed values for
+ // starting_value. The guesses come from Autofill data, drawing from the most
+ // filled out AutofillProfile.
+ void PopulateInputsWithGuesses();
+
// Fills in |section|-related fields in |output_| according to the state of
// |view_|.
void FillOutputForSection(DialogSection section);
diff --git a/chrome/browser/ui/views/autofill/autofill_dialog_views.cc b/chrome/browser/ui/views/autofill/autofill_dialog_views.cc
index 6d081df..2ad4051 100644
--- a/chrome/browser/ui/views/autofill/autofill_dialog_views.cc
+++ b/chrome/browser/ui/views/autofill/autofill_dialog_views.cc
@@ -299,7 +299,7 @@ views::View* AutofillDialogViews::InitInputsView(DialogSection section) {
for (DetailInputs::const_iterator it = inputs.begin();
it != inputs.end(); ++it) {
- const DetailInput& input = **it;
+ const DetailInput& input = *it;
if (!controller_->ShouldShowInput(input))
continue;
@@ -329,6 +329,7 @@ views::View* AutofillDialogViews::InitInputsView(DialogSection section) {
views::Textfield* field = new views::Textfield();
field->set_placeholder_text(ASCIIToUTF16(input.placeholder_text));
+ field->SetText(input.starting_value);
textfields->insert(std::make_pair(&input, field));
layout->AddView(field);
}
generated by cgit v1.1 at 2025-03-14 12:06:20 +0000