Index: chrome/browser/autofill/autofill_manager.cc |
diff --git a/chrome/browser/autofill/autofill_manager.cc b/chrome/browser/autofill/autofill_manager.cc |
index 150d51a7fa39b81fe2e7269606dda8b8fb6b41b8..2b1f79e8bb72e7625a380a56e6b7e6a5eaf728a6 100644 |
--- a/chrome/browser/autofill/autofill_manager.cc |
+++ b/chrome/browser/autofill/autofill_manager.cc |
@@ -23,6 +23,7 @@ |
#include "base/utf_string_conversions.h" |
#include "chrome/browser/api/infobars/infobar_service.h" |
#include "chrome/browser/api/sync/profile_sync_service_base.h" |
+#include "chrome/browser/autofill/autocheckout/whitelist_manager.h" |
#include "chrome/browser/autofill/autocheckout_manager.h" |
#include "chrome/browser/autofill/autocheckout_infobar_delegate.h" |
#include "chrome/browser/autofill/autocomplete_history_manager.h" |
@@ -393,7 +394,8 @@ bool AutofillManager::OnFormSubmitted(const FormData& form, |
return false; |
// Grab a copy of the form data. |
- scoped_ptr<FormStructure> submitted_form(new FormStructure(form)); |
+ scoped_ptr<FormStructure> submitted_form( |
+ new FormStructure(form, IsAutocheckoutEnabled())); |
// Disregard forms that we wouldn't ever autofill in the first place. |
if (!submitted_form->ShouldBeParsed(true)) |
@@ -453,6 +455,9 @@ bool AutofillManager::OnFormSubmitted(const FormData& form, |
void AutofillManager::OnFormsSeen(const std::vector<FormData>& forms, |
const TimeTicks& timestamp) { |
+ DVLOG(1) << "Autocheckout is " |
+ << (IsAutocheckoutEnabled() ? "enabled" : "disabled") |
+ << " for " << web_contents()->GetURL(); |
bool enabled = IsAutofillEnabled(); |
if (!has_logged_autofill_enabled_) { |
metric_logger_->LogIsAutofillEnabledAtPageLoad(enabled); |
@@ -885,6 +890,16 @@ void AutofillManager::OnClickFailed(autofill::AutocheckoutStatus status) { |
// TODO(ahutter): Plug into WalletClient. |
} |
+bool AutofillManager::IsAutocheckoutEnabled() const { |
+ if (!web_contents()) |
+ return false; |
+ |
+ autofill::autocheckout::WhitelistManager* whitelist_manager = |
+ autofill::autocheckout::WhitelistManager::GetForBrowserContext( |
+ web_contents()->GetBrowserContext()); |
+ return whitelist_manager->IsAutocheckoutEnabled(web_contents()->GetURL()); |
+} |
+ |
bool AutofillManager::IsAutofillEnabled() const { |
return manager_delegate_->GetPrefs()->GetBoolean(prefs::kAutofillEnabled); |
} |
@@ -1085,7 +1100,7 @@ bool AutofillManager::GetCachedFormAndField(const FormData& form, |
// If we do not have this form in our cache but it is parseable, we'll add it |
// in the call to |UpdateCachedForm()|. |
if (!FindCachedForm(form, form_structure) && |
- !FormStructure(form).ShouldBeParsed(false)) { |
+ !FormStructure(form, IsAutocheckoutEnabled()).ShouldBeParsed(false)) { |
return false; |
} |
@@ -1132,7 +1147,8 @@ bool AutofillManager::UpdateCachedForm(const FormData& live_form, |
return false; |
// Add the new or updated form to our cache. |
- form_structures_.push_back(new FormStructure(live_form)); |
+ form_structures_.push_back( |
+ new FormStructure(live_form, IsAutocheckoutEnabled())); |
*updated_form = *form_structures_.rbegin(); |
(*updated_form)->DetermineHeuristicTypes(*metric_logger_); |
@@ -1208,9 +1224,11 @@ void AutofillManager::GetCreditCardSuggestions( |
void AutofillManager::ParseForms(const std::vector<FormData>& forms) { |
std::vector<FormStructure*> non_queryable_forms; |
+ bool autocheckout_enabled = IsAutocheckoutEnabled(); |
for (std::vector<FormData>::const_iterator iter = forms.begin(); |
iter != forms.end(); ++iter) { |
- scoped_ptr<FormStructure> form_structure(new FormStructure(*iter)); |
+ scoped_ptr<FormStructure> form_structure( |
+ new FormStructure(*iter, autocheckout_enabled)); |
if (!form_structure->ShouldBeParsed(false)) |
continue; |