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

Unified Diff: chrome/browser/ui/views/payments/payment_request_dialog_view.cc

Issue 2849523003: Add billing address as a mandatory field of Payments credit cards. (Closed)
Patch Set: Components Unittests fix Created 3 years, 7 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: chrome/browser/ui/views/payments/payment_request_dialog_view.cc
diff --git a/chrome/browser/ui/views/payments/payment_request_dialog_view.cc b/chrome/browser/ui/views/payments/payment_request_dialog_view.cc
index 8752e2a8ee51a900ea1c8345c74063e4743cbb2f..1363aae99018e2e8ad819b8f1b1e0f301adc34c3 100644
--- a/chrome/browser/ui/views/payments/payment_request_dialog_view.cc
+++ b/chrome/browser/ui/views/payments/payment_request_dialog_view.cc
@@ -238,14 +238,17 @@ void PaymentRequestDialogView::ShowCvcUnmaskPrompt(
}
void PaymentRequestDialogView::ShowCreditCardEditor(
+ BackNavigationType back_navigation_type,
+ int next_ui_tag,
base::OnceClosure on_edited,
base::OnceCallback<void(const autofill::CreditCard&)> on_added,
autofill::CreditCard* credit_card) {
view_stack_->Push(
CreateViewAndInstallController(
base::MakeUnique<CreditCardEditorViewController>(
- request_->spec(), request_->state(), this, std::move(on_edited),
- std::move(on_added), credit_card),
+ request_->spec(), request_->state(), this, back_navigation_type,
+ next_ui_tag, std::move(on_edited), std::move(on_added),
+ credit_card),
&controller_map_),
/* animate = */ true);
if (observer_for_testing_)
@@ -253,24 +256,28 @@ void PaymentRequestDialogView::ShowCreditCardEditor(
}
void PaymentRequestDialogView::ShowShippingAddressEditor(
+ BackNavigationType back_navigation_type,
base::OnceClosure on_edited,
base::OnceCallback<void(const autofill::AutofillProfile&)> on_added,
autofill::AutofillProfile* profile) {
- view_stack_->Push(CreateViewAndInstallController(
- base::MakeUnique<ShippingAddressEditorViewController>(
- request_->spec(), request_->state(), this,
- std::move(on_edited), std::move(on_added), profile),
- &controller_map_),
- /* animate = */ true);
+ view_stack_->Push(
+ CreateViewAndInstallController(
+ base::MakeUnique<ShippingAddressEditorViewController>(
+ request_->spec(), request_->state(), this, back_navigation_type,
+ std::move(on_edited), std::move(on_added), profile),
+ &controller_map_),
+ /* animate = */ true);
if (observer_for_testing_)
observer_for_testing_->OnShippingAddressEditorOpened();
}
void PaymentRequestDialogView::ShowContactInfoEditor(
+ BackNavigationType back_navigation_type,
autofill::AutofillProfile* profile) {
view_stack_->Push(CreateViewAndInstallController(
base::MakeUnique<ContactInfoEditorViewController>(
- request_->spec(), request_->state(), this, profile),
+ request_->spec(), request_->state(), this,
+ back_navigation_type, profile),
&controller_map_),
/* animate = */ true);
if (observer_for_testing_)

Powered by Google App Engine
This is Rietveld 408576698