summaryrefslogtreecommitdiffstats
path: root/components
diff options
context:
space:
mode:
authorMathieu Perreault <mathp@chromium.org>2016-02-01 19:11:53 -0500
committerMathieu Perreault <mathp@chromium.org>2016-02-02 00:13:53 +0000
commit788038fde3dd6076365ce4b3e6e48ba6cf9543aa (patch)
tree6f646d695b9408954dbc90966728306316a6a018 /components
parent810b535c2fa25adee8edb875cbf97ba1f3fe2a50 (diff)
downloadchromium_src-788038fde3dd6076365ce4b3e6e48ba6cf9543aa.zip
chromium_src-788038fde3dd6076365ce4b3e6e48ba6cf9543aa.tar.gz
chromium_src-788038fde3dd6076365ce4b3e6e48ba6cf9543aa.tar.bz2
[Merge M49][Autofill] Remove warning for CC autofill on secure pages with mixed passive content
Test page: https://420fb7a0cffed907f3562bad84d357ad43f54dbd.googledrive.com/host/0B3xzZ-vFr2LRWVFBaWl2V0M4NFk BUG=574839 TEST=manual Review URL: https://codereview.chromium.org/1659463003 Cr-Commit-Position: refs/heads/master@{#372784} (cherry picked from commit af4d5da88d32e36044079a49f1af46e7d28fff70) Review URL: https://codereview.chromium.org/1649293004 . Cr-Commit-Position: refs/branch-heads/2623@{#229} Cr-Branched-From: 92d77538a86529ca35f9220bd3cd512cbea1f086-refs/heads/master@{#369907}
Diffstat (limited to 'components')
-rw-r--r--components/autofill/core/browser/autofill_manager.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/components/autofill/core/browser/autofill_manager.cc b/components/autofill/core/browser/autofill_manager.cc
index f13bcc3..4c346f6 100644
--- a/components/autofill/core/browser/autofill_manager.cc
+++ b/components/autofill/core/browser/autofill_manager.cc
@@ -427,9 +427,9 @@ void AutofillManager::OnQueryFormFieldAutofill(int query_id,
GetProfileSuggestions(*form_structure, field, *autofill_field);
}
if (!suggestions.empty()) {
- // Don't provide credit card suggestions for non-secure pages. However,
- // do provide a warning to the user. This will generate warnings on pages
- // with mixed content (which includes forms with an http target).
+ // Don't provide credit card suggestions for non-secure pages, but do
+ // provide them for secure pages with passive mixed content (see impl. of
+ // IsContextSecure).
if (is_filling_credit_card &&
!client_->IsContextSecure(form_structure->source_url())) {
Suggestion warning_suggestion(l10n_util::GetStringUTF16(