| Index: chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc
|
| diff --git a/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc b/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc
|
| index ac629abe137c2693fc0d754969057de220e6652a..e87dd8f65e71700e57d97b50ade72d0ca635118b 100644
|
| --- a/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc
|
| +++ b/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc
|
| @@ -226,7 +226,8 @@ AutofillDialogControllerImpl::AutofillDialogControllerImpl(
|
| const GURL& source_url,
|
| const AutofillMetrics& metric_logger,
|
| DialogType dialog_type,
|
| - const base::Callback<void(const FormStructure*)>& callback)
|
| + const base::Callback<void(const FormStructure*,
|
| + const std::string&)>& callback)
|
| : profile_(Profile::FromBrowserContext(contents->GetBrowserContext())),
|
| contents_(contents),
|
| form_structure_(form, std::string()),
|
| @@ -300,7 +301,7 @@ void AutofillDialogControllerImpl::Show() {
|
| &has_sections);
|
| // Fail if the author didn't specify autocomplete types.
|
| if (!has_types) {
|
| - callback_.Run(NULL);
|
| + callback_.Run(NULL, std::string());
|
| delete this;
|
| return;
|
| }
|
| @@ -1064,8 +1065,9 @@ void AutofillDialogControllerImpl::OnCancel() {
|
| // submitted to start the flow and then cancelled to close the dialog after
|
| // the error.
|
| if (!callback_.is_null()) {
|
| - callback_.Run(NULL);
|
| - callback_ = base::Callback<void(const FormStructure*)>();
|
| + callback_.Run(NULL, std::string());
|
| + callback_ = base::Callback<void(const FormStructure*,
|
| + const std::string&)>();
|
| }
|
| }
|
|
|
| @@ -1289,10 +1291,6 @@ void AutofillDialogControllerImpl::OnDidSaveInstrumentAndAddress(
|
| GetFullWallet();
|
| }
|
|
|
| -void AutofillDialogControllerImpl::OnDidSendAutocheckoutStatus() {
|
| - NOTIMPLEMENTED();
|
| -}
|
| -
|
| void AutofillDialogControllerImpl::OnDidUpdateAddress(
|
| const std::string& address_id,
|
| const std::vector<wallet::RequiredAction>& required_actions) {
|
| @@ -1809,8 +1807,11 @@ void AutofillDialogControllerImpl::FinishSubmit() {
|
| } else {
|
| FillOutputForSection(SECTION_SHIPPING);
|
| }
|
| - callback_.Run(&form_structure_);
|
| - callback_ = base::Callback<void(const FormStructure*)>();
|
| + if (wallet_items_)
|
| + callback_.Run(&form_structure_, wallet_items_->google_transaction_id());
|
| + else
|
| + callback_.Run(&form_structure_, std::string());
|
| + callback_ = base::Callback<void(const FormStructure*, const std::string&)>();
|
|
|
| if (dialog_type_ == DIALOG_TYPE_REQUEST_AUTOCOMPLETE) {
|
| // This may delete us.
|
|
|