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

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

Issue 15097004: Enable Autocomplete feature for chromium webview (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@setSaveFormData2
Patch Set: add a check that disappeared during a merge. Created 7 years, 6 months 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_manager.cc
diff --git a/components/autofill/core/browser/autofill_manager.cc b/components/autofill/core/browser/autofill_manager.cc
index 4cbc8afa86a6ed88d1ba6e88b50af66b438d1c9c..4597cbffd325e1eeb7f5d7ed155f10e3fd7c753c 100644
--- a/components/autofill/core/browser/autofill_manager.cc
+++ b/components/autofill/core/browser/autofill_manager.cc
@@ -188,7 +188,8 @@ AutofillManager::AutofillManager(
manager_delegate_(delegate),
app_locale_(app_locale),
personal_data_(delegate->GetPersonalDataManager()),
- autocomplete_history_manager_(driver),
+ autocomplete_history_manager_(
+ new AutocompleteHistoryManager(driver, delegate)),
autocheckout_manager_(this),
metric_logger_(new AutofillMetrics),
has_logged_autofill_enabled_(false),
@@ -242,7 +243,7 @@ void AutofillManager::SetExternalDelegate(AutofillExternalDelegate* delegate) {
// work if the delegate has a pointer to the AutofillManager, but
// future directions may not need such a pointer.
external_delegate_ = delegate;
- autocomplete_history_manager_.SetExternalDelegate(delegate);
+ autocomplete_history_manager_->SetExternalDelegate(delegate);
}
bool AutofillManager::IsNativeUiEnabled() {
@@ -251,8 +252,8 @@ bool AutofillManager::IsNativeUiEnabled() {
bool AutofillManager::OnFormSubmitted(const FormData& form,
const TimeTicks& timestamp) {
- // Let AutoComplete know as well.
- autocomplete_history_manager_.OnFormSubmitted(form);
+ // Let Autocomplete know as well.
+ autocomplete_history_manager_->OnFormSubmitted(form);
if (!IsAutofillEnabled())
return false;
@@ -486,7 +487,7 @@ 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(
+ autocomplete_history_manager_->OnGetAutocompleteSuggestions(
query_id, field.name, field.value, values, labels, icons, unique_ids);
}
@@ -640,7 +641,7 @@ void AutofillManager::RemoveAutofillProfileOrCreditCard(int unique_id) {
void AutofillManager::RemoveAutocompleteEntry(const base::string16& name,
const base::string16& value) {
- autocomplete_history_manager_.OnRemoveAutocompleteEntry(name, value);
+ autocomplete_history_manager_->OnRemoveAutocompleteEntry(name, value);
}
content::WebContents* AutofillManager::GetWebContents() const {
@@ -786,8 +787,8 @@ std::string AutofillManager::GetAutocheckoutURLPrefix() const {
autofill::autocheckout::WhitelistManager* whitelist_manager =
manager_delegate_->GetAutocheckoutWhitelistManager();
- return whitelist_manager->GetMatchedURLPrefix(
- driver_->GetWebContents()->GetURL());
+ return whitelist_manager ? whitelist_manager->GetMatchedURLPrefix(
+ driver_->GetWebContents()->GetURL()) : std::string();
}
bool AutofillManager::IsAutofillEnabled() const {
@@ -912,7 +913,8 @@ AutofillManager::AutofillManager(AutofillDriver* driver,
manager_delegate_(delegate),
app_locale_("en-US"),
personal_data_(personal_data),
- autocomplete_history_manager_(driver),
+ autocomplete_history_manager_(
+ new AutocompleteHistoryManager(driver, delegate)),
autocheckout_manager_(this),
metric_logger_(new AutofillMetrics),
has_logged_autofill_enabled_(false),
« no previous file with comments | « components/autofill/core/browser/autofill_manager.h ('k') | components/autofill/core/browser/autofill_manager_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698