| Index: components/autofill/core/browser/autofill_manager.cc
|
| diff --git a/components/autofill/core/browser/autofill_manager.cc b/components/autofill/core/browser/autofill_manager.cc
|
| index 48cd5974c206b50c064630dace3cb85731b24497..9e8089dc1d514886be966c408e3f939e1d42914a 100644
|
| --- a/components/autofill/core/browser/autofill_manager.cc
|
| +++ b/components/autofill/core/browser/autofill_manager.cc
|
| @@ -530,12 +530,20 @@ void AutofillManager::OnQueryFormFieldAutofill(int query_id,
|
| }
|
| }
|
|
|
| - // Add the results from AutoComplete. They come back asynchronously, so we
|
| - // hand off what we generated and they will send the results back to the
|
| - // renderer.
|
| - autocomplete_history_manager_->OnGetAutocompleteSuggestions(
|
| - query_id, field.name, field.value, field.form_control_type, values,
|
| - labels, icons, unique_ids);
|
| + if (field.should_autocomplete) {
|
| + // Add the results from AutoComplete. They come back asynchronously, so we
|
| + // hand off what we generated and they will send the results back to the
|
| + // renderer.
|
| + autocomplete_history_manager_->OnGetAutocompleteSuggestions(
|
| + query_id, field.name, field.value, field.form_control_type, values,
|
| + labels, icons, unique_ids);
|
| + } else {
|
| + // Autocomplete is disabled for this field; only pass back Autofill
|
| + // suggestions.
|
| + autocomplete_history_manager_->CancelPendingQuery();
|
| + external_delegate_->OnSuggestionsReturned(
|
| + query_id, values, labels, icons, unique_ids);
|
| + }
|
| }
|
|
|
| void AutofillManager::FillOrPreviewForm(
|
|
|