Index: components/autofill/browser/autofill_manager.cc |
diff --git a/components/autofill/browser/autofill_manager.cc b/components/autofill/browser/autofill_manager.cc |
index 209294a639d1ed73931219dd31047398bfd66bb7..b74f154dc18d31bd4feddbdbb17c2761e006c795 100644 |
--- a/components/autofill/browser/autofill_manager.cc |
+++ b/components/autofill/browser/autofill_manager.cc |
@@ -768,7 +768,8 @@ void AutofillManager::ShowRequestAutocompleteDialog( |
const FormData& form, |
const GURL& source_url, |
autofill::DialogType dialog_type, |
- const base::Callback<void(const FormStructure*)>& callback) { |
+ const base::Callback<void(const FormStructure*, |
+ const std::string&)>& callback) { |
manager_delegate_->ShowRequestAutocompleteDialog( |
form, source_url, *metric_logger_, dialog_type, callback); |
} |
@@ -823,7 +824,7 @@ void AutofillManager::OnRequestAutocomplete( |
return; |
} |
- base::Callback<void(const FormStructure*)> callback = |
+ base::Callback<void(const FormStructure*, const std::string&)> callback = |
base::Bind(&AutofillManager::ReturnAutocompleteData, |
weak_ptr_factory_.GetWeakPtr()); |
ShowRequestAutocompleteDialog( |
@@ -846,7 +847,8 @@ void AutofillManager::ReturnAutocompleteResult( |
form_data)); |
} |
-void AutofillManager::ReturnAutocompleteData(const FormStructure* result) { |
+void AutofillManager::ReturnAutocompleteData(const FormStructure* result, |
+ const std::string& not_used) { |
Ilya Sherman
2013/03/26 23:50:01
nit: "not_used" -> "unused_transaction_id"
ahutter
2013/03/27 01:23:33
Done.
|
RequestAutocompleteDialogClosed(); |
if (!result) { |
ReturnAutocompleteResult(WebFormElement::AutocompleteResultErrorCancel, |
@@ -880,7 +882,7 @@ void AutofillManager::OnDidEndTextFieldEditing() { |
} |
void AutofillManager::OnClickFailed(autofill::AutocheckoutStatus status) { |
- // TODO(ahutter): Plug into WalletClient. |
+ autocheckout_manager_.OnClickFailed(status); |
} |
void AutofillManager::OnMaybeShowAutocheckoutBubble( |