Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(234)

Unified Diff: components/autofill/core/browser/autofill_external_delegate.cc

Issue 2478043002: HTTP Bad: Add warning message to autofill dropdown for http sites (Closed)
Patch Set: advise test Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/autofill/core/browser/autofill_external_delegate.cc
diff --git a/components/autofill/core/browser/autofill_external_delegate.cc b/components/autofill/core/browser/autofill_external_delegate.cc
index 6b04aa5b5733fa0e876d9bb7fe52e030075ccd62..e4f80841a083ffbb0d1ce29ccde98977e7af053a 100644
--- a/components/autofill/core/browser/autofill_external_delegate.cc
+++ b/components/autofill/core/browser/autofill_external_delegate.cc
@@ -70,8 +70,8 @@ void AutofillExternalDelegate::OnSuggestionsReturned(
// The suggestions and warnings are "above the fold" and are separated from
// other menu items with a separator.
std::vector<Suggestion> suggestions(input_suggestions);
- // Add or hide warnings as appropriate.
- ApplyAutofillWarnings(&suggestions);
+ // Hide warnings as appropriate.
+ PossiblyRemoveAutofillWarnings(&suggestions);
#if !defined(OS_ANDROID)
// If there are above the fold suggestions at this point, add a separator to
@@ -299,12 +299,13 @@ void AutofillExternalDelegate::FillAutofillFormData(int unique_id,
unique_id);
}
-void AutofillExternalDelegate::ApplyAutofillWarnings(
+void AutofillExternalDelegate::PossiblyRemoveAutofillWarnings(
std::vector<Suggestion>* suggestions) {
- if (suggestions->size() > 1 &&
- (*suggestions)[0].frontend_id == POPUP_ITEM_ID_WARNING_MESSAGE) {
- // If we received a warning instead of suggestions from Autofill but regular
- // suggestions from autocomplete, don't show the Autofill warning.
+ while (suggestions->size() > 1 &&
+ IsAutofillWarningEntry(suggestions->front().frontend_id) &&
+ !IsAutofillWarningEntry(suggestions->back().frontend_id)) {
+ // If we received warnings instead of suggestions from Autofill but regular
+ // suggestions from autocomplete, don't show the Autofill warnings.
suggestions->erase(suggestions->begin());
}
}
@@ -373,4 +374,8 @@ void AutofillExternalDelegate::InsertDataListValues(
}
}
+bool AutofillExternalDelegate::IsAutofillWarningEntry(int frontend_id) {
+ return frontend_id == POPUP_ITEM_ID_WARNING_MESSAGE;
+}
+
} // namespace autofill

Powered by Google App Engine
This is Rietveld 408576698