Index: components/autofill/renderer/autofill_agent.cc |
diff --git a/components/autofill/renderer/autofill_agent.cc b/components/autofill/renderer/autofill_agent.cc |
index c85c265efae424a9a745c801536f06334b09580f..e0edd44b338130aca60aac37f4958603fe8ec348 100644 |
--- a/components/autofill/renderer/autofill_agent.cc |
+++ b/components/autofill/renderer/autofill_agent.cc |
@@ -212,11 +212,14 @@ void AutofillAgent::DidFinishDocumentLoad(WebFrame* frame) { |
form_cache_.ExtractForms(*frame, &forms); |
} |
+ autofill::FormsSeenParam param = has_more_forms ? |
+ autofill::PARTIAL_FORMS_SEEN : autofill::NO_SPECIAL_FORMS_SEEN; |
+ |
// Always communicate to browser process for topmost frame. |
if (!forms.empty() || !frame->parent()) { |
Send(new AutofillHostMsg_FormsSeen(routing_id(), forms, |
forms_seen_timestamp_, |
- has_more_forms)); |
+ param)); |
} |
} |
@@ -726,7 +729,8 @@ void AutofillAgent::OnGetAllForms() { |
// Report to AutofillManager that all forms are being sent. |
Send(new AutofillHostMsg_FormsSeen(routing_id(), forms, |
- forms_seen_timestamp_, false)); |
+ forms_seen_timestamp_, |
+ NO_SPECIAL_FORMS_SEEN)); |
} |
void AutofillAgent::OnRequestAutocompleteResult( |
@@ -774,6 +778,8 @@ void AutofillAgent::OnFillFormsAndClick( |
void AutofillAgent::OnWhitelistedForAutocheckout() { |
is_whitelisted_for_autocheckout_ = true; |
+ if (forms_have_changed_since_load_) |
+ SendDynamicFormsSeen(); |
} |
void AutofillAgent::ClickFailed() { |
@@ -931,4 +937,36 @@ void AutofillAgent::HideHostAutofillUi() { |
Send(new AutofillHostMsg_HideAutofillUi(routing_id())); |
} |
+void AutofillAgent::didAssociateFormControls( |
+ const WebKit::WebVector<WebKit::WebNode>& nodes) { |
+ for (size_t i = 0; i < nodes.size(); ++i) { |
+ WebKit::WebNode node = nodes[i]; |
+ if (node.document().frame() == topmost_frame_) { |
+ forms_seen_timestamp_ = base::TimeTicks::Now(); |
+ forms_have_changed_since_load_ = true; |
+ break; |
+ } |
+ } |
+ |
+ if (forms_have_changed_since_load_ && is_whitelisted_for_autocheckout_) |
+ SendDynamicFormsSeen(); |
+} |
+ |
+void AutofillAgent::SendDynamicFormsSeen() { |
Ilya Sherman
2013/04/06 00:29:39
nit: Please name this MaybeSendDynamicFormsSeen(),
Dane Wallinga
2013/04/08 22:55:50
Done.
|
+ forms_have_changed_since_load_ = false; |
+ bool has_more_forms = false; |
+ std::vector<FormData> forms; |
+ form_elements_.clear(); |
+ has_more_forms = form_cache_.ExtractFormsAndFormElements( |
+ *topmost_frame_, kRequiredAutofillFields, &forms, &form_elements_); |
Ilya Sherman
2013/04/06 00:29:39
nit: Write these six lines like so:
forms_have_
Dane Wallinga
2013/04/08 22:55:50
Done.
|
+ autofill::FormsSeenParam param = has_more_forms ? |
+ autofill::PARTIAL_AND_DYNAMIC_FORMS_SEEN : autofill::DYNAMIC_FORMS_SEEN; |
+ |
+ if (!forms.empty()) { |
+ Send(new AutofillHostMsg_FormsSeen(routing_id(), forms, |
+ forms_seen_timestamp_, |
+ param)); |
+ } |
+} |
+ |
} // namespace autofill |