Index: components/autofill/content/renderer/autofill_agent.cc |
diff --git a/components/autofill/content/renderer/autofill_agent.cc b/components/autofill/content/renderer/autofill_agent.cc |
index ebcda2a24d468632f700311a65341bd0c00fe6c8..9f32ae842d3f42b64f2b27b2873f6b798c9a2fec 100644 |
--- a/components/autofill/content/renderer/autofill_agent.cc |
+++ b/components/autofill/content/renderer/autofill_agent.cc |
@@ -290,11 +290,14 @@ void AutofillAgent::FocusChangeComplete() { |
WebElement focused_element; |
if (!doc.isNull()) |
focused_element = doc.focusedElement(); |
- |
- if (!focused_element.isNull() && password_generation_agent_ && |
- password_generation_agent_->FocusedNodeHasChanged(focused_element)) { |
- is_generation_popup_possibly_visible_ = true; |
- is_popup_possibly_visible_ = true; |
+ if (!focused_element.isNull()) { |
+ if (password_generation_agent_ && |
+ password_generation_agent_->FocusedNodeHasChanged(focused_element)) { |
+ is_generation_popup_possibly_visible_ = true; |
+ is_popup_possibly_visible_ = true; |
+ } |
+ if (password_autofill_agent_) |
+ password_autofill_agent_->FocusedNodeHasChanged(focused_element); |
} |
} |
@@ -695,7 +698,8 @@ void AutofillAgent::QueryAutofillSuggestions( |
&field)) { |
// If we didn't find the cached form, at least let autocomplete have a shot |
// at providing suggestions. |
- WebFormControlElementToFormField(element, form_util::EXTRACT_VALUE, &field); |
+ WebFormControlElementToFormField(element, nullptr, form_util::EXTRACT_VALUE, |
+ &field); |
} |
std::vector<base::string16> data_list_values; |