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 68d2a361e98cdff996d11e5d7def52bbd4fa7053..80409deda5bf06a1a1177b714b34db0a18f1482c 100644 |
--- a/components/autofill/core/browser/autofill_manager.cc |
+++ b/components/autofill/core/browser/autofill_manager.cc |
@@ -285,13 +285,17 @@ void AutofillManager::ShowAutofillSettings() { |
bool AutofillManager::ShouldShowAccessAddressBookSuggestion( |
const FormData& form, |
const FormFieldData& field) { |
- if (!personal_data_) |
+ if (!personal_data_ || !field.should_autocomplete) |
return false; |
+ |
FormStructure* form_structure = NULL; |
AutofillField* autofill_field = NULL; |
if (!GetCachedFormAndField(form, field, &form_structure, &autofill_field)) |
return false; |
+ if (!form_structure->IsAutofillable()) |
+ return false; |
+ |
return personal_data_->ShouldShowAccessAddressBookSuggestion( |
autofill_field->Type()); |
} |