| Index: chrome/browser/ui/views/payments/payment_request_dialog.cc
|
| diff --git a/chrome/browser/ui/views/payments/payment_request_dialog.cc b/chrome/browser/ui/views/payments/payment_request_dialog.cc
|
| index 58af72fbc2849df579a0295a15fb49a9e74438ed..6be31e1aa49764cfe012a60be6adf863670b21ec 100644
|
| --- a/chrome/browser/ui/views/payments/payment_request_dialog.cc
|
| +++ b/chrome/browser/ui/views/payments/payment_request_dialog.cc
|
| @@ -11,6 +11,7 @@
|
| #include "chrome/browser/ui/views/payments/order_summary_view_controller.h"
|
| #include "chrome/browser/ui/views/payments/payment_method_view_controller.h"
|
| #include "chrome/browser/ui/views/payments/payment_sheet_view_controller.h"
|
| +#include "chrome/browser/ui/views/payments/shipping_list_view_controller.h"
|
| #include "chrome/grit/generated_resources.h"
|
| #include "components/constrained_window/constrained_window_views.h"
|
| #include "components/payments/payment_request.h"
|
| @@ -95,14 +96,19 @@ void PaymentRequestDialog::GoBack() {
|
| void PaymentRequestDialog::ShowOrderSummary() {
|
| view_stack_.Push(CreateViewAndInstallController<OrderSummaryViewController>(
|
| &controller_map_, request_, this),
|
| - true);
|
| + /* animate = */ true);
|
| +}
|
| +
|
| +void PaymentRequestDialog::ShowShippingListSheet() {
|
| + view_stack_.Push(CreateViewAndInstallController<ShippingListViewController>(
|
| + &controller_map_, request_, this),
|
| + /* animate = */ true);
|
| }
|
|
|
| void PaymentRequestDialog::ShowPaymentMethodSheet() {
|
| - view_stack_.Push(
|
| - CreateViewAndInstallController<PaymentMethodViewController>(
|
| - &controller_map_, request_, this),
|
| - true);
|
| + view_stack_.Push(CreateViewAndInstallController<PaymentMethodViewController>(
|
| + &controller_map_, request_, this),
|
| + /* animate = */ true);
|
| }
|
|
|
| void PaymentRequestDialog::CloseDialog() {
|
| @@ -112,7 +118,7 @@ void PaymentRequestDialog::CloseDialog() {
|
| void PaymentRequestDialog::ShowInitialPaymentSheet() {
|
| view_stack_.Push(CreateViewAndInstallController<PaymentSheetViewController>(
|
| &controller_map_, request_, this),
|
| - false);
|
| + /* animate = */ false);
|
| }
|
|
|
| gfx::Size PaymentRequestDialog::GetPreferredSize() const {
|
|
|