Add billing address as a mandatory field of Payments credit cards.

chrome/browser/ui/views/payments/payment_sheet_view_controller.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/payments/payment_sheet_view_controller.h"
 
 #include <algorithm>
 #include <memory>
 #include <string>
 #include <utility>
@@ skipping 47 matching lines @@
 // Tags for the buttons in the payment sheet
 enum class PaymentSheetViewControllerTags {
   SHOW_ORDER_SUMMARY_BUTTON = kFirstTagValue,  // Navigate to order summary
   SHOW_SHIPPING_BUTTON,         // Navigate to the shipping address screen
   ADD_SHIPPING_BUTTON,          // Navigate to the shipping address editor
   SHOW_PAYMENT_METHOD_BUTTON,   // Navigate to the payment method screen
   ADD_PAYMENT_METHOD_BUTTON,    // Navigate to the payment method editor
   SHOW_CONTACT_INFO_BUTTON,     // Navigate to the contact info screen
   ADD_CONTACT_INFO_BUTTON,      // Navigate to the contact info editor
   SHOW_SHIPPING_OPTION_BUTTON,  // Navigate to the shipping options screen
-  PAY_BUTTON
+  PAY_BUTTON,
+  MAX_TAG,  // Always keep last.
 };
 
 // A class that ensures proper elision of labels in the form
 // "[preview] and N more" where preview might be elided to allow "and N more" to
 // be always visible.
 class PreviewEliderLabel : public views::Label {
  public:
   // Creates a PreviewEliderLabel where |preview_text| might be elided,
   // |format_string| is the string with format argument numbers in ICU syntax
   // and |n| is the "N more" item count.
@@ skipping 399 matching lines @@
         PaymentSheetViewControllerTags::SHOW_ORDER_SUMMARY_BUTTON):
       dialog()->ShowOrderSummary();
       break;
 
     case static_cast<int>(PaymentSheetViewControllerTags::SHOW_SHIPPING_BUTTON):
       dialog()->ShowShippingProfileSheet();
       break;
 
     case static_cast<int>(PaymentSheetViewControllerTags::ADD_SHIPPING_BUTTON):
       dialog()->ShowShippingAddressEditor(
+          BackNavigationType::kPaymentSheet,
           /*on_edited=*/base::OnceClosure(),  // This is always an add.
           /*on_added=*/
           base::BindOnce(&PaymentRequestState::AddAutofillShippingProfile,
                          base::Unretained(state()), /*selected=*/true),
           nullptr);
       break;
 
     case static_cast<int>(
         PaymentSheetViewControllerTags::SHOW_PAYMENT_METHOD_BUTTON):
       dialog()->ShowPaymentMethodSheet();
       break;
 
     case static_cast<int>(
         PaymentSheetViewControllerTags::ADD_PAYMENT_METHOD_BUTTON):
       dialog()->ShowCreditCardEditor(
+          BackNavigationType::kPaymentSheet,
+          static_cast<int>(PaymentSheetViewControllerTags::MAX_TAG),
           /*on_edited=*/base::OnceClosure(),  // This is always an add.
           /*on_added=*/
           base::BindOnce(&PaymentRequestState::AddAutofillPaymentInstrument,
                          base::Unretained(state()), /*selected=*/true),
           /*credit_card=*/nullptr);
 
       break;
 
     case static_cast<int>(
         PaymentSheetViewControllerTags::SHOW_CONTACT_INFO_BUTTON):
       dialog()->ShowContactProfileSheet();
       break;
 
     case static_cast<int>(
         PaymentSheetViewControllerTags::ADD_CONTACT_INFO_BUTTON):
-      dialog()->ShowContactInfoEditor();
+      dialog()->ShowContactInfoEditor(BackNavigationType::kPaymentSheet);
       break;
 
     case static_cast<int>(
         PaymentSheetViewControllerTags::SHOW_SHIPPING_OPTION_BUTTON):
       dialog()->ShowShippingOptionSheet();
       break;
 
     default:
       PaymentRequestSheetController::ButtonPressed(sender, event);
       break;
@@ skipping 359 matching lines @@
   } else {
     return builder
         .Id(DialogViewID::PAYMENT_SHEET_SHIPPING_OPTION_SECTION_BUTTON)
         .CreateWithButton(
             l10n_util::GetStringUTF16(IDS_PAYMENT_REQUEST_CHOOSE_AN_ADDRESS),
             l10n_util::GetStringUTF16(IDS_CHOOSE), /*button_enabled=*/false);
   }
 }
 
 }  // namespace payments