[Web Payments] Go to editors directly when "Add" buttons are pressed

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 37 matching lines @@
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/vector_icons.h"
 #include "ui/views/view.h"
 
 namespace payments {
 namespace {
 
 constexpr int kFirstTagValue = static_cast<int>(
     payments::PaymentRequestCommonTags::PAYMENT_REQUEST_COMMON_TAG_MAX);
 
+// Tags for the buttons in the payment sheet
 enum class PaymentSheetViewControllerTags {
-  // The tag for the button that navigates to the Order Summary sheet.
-  SHOW_ORDER_SUMMARY_BUTTON = kFirstTagValue,
-  SHOW_SHIPPING_BUTTON,
-  SHOW_PAYMENT_METHOD_BUTTON,
-  SHOW_CONTACT_INFO_BUTTON,
-  SHOW_SHIPPING_OPTION_BUTTON,
+  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
 };
 
 // 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
@@ skipping 403 matching lines @@
   switch (sender->tag()) {
     case static_cast<int>(
         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(
+          /*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(
+          /*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();
+      break;
+
+    case static_cast<int>(
         PaymentSheetViewControllerTags::SHOW_SHIPPING_OPTION_BUTTON):
       dialog()->ShowShippingOptionSheet();
       break;
 
     default:
       PaymentRequestSheetController::ButtonPressed(sender, event);
       break;
   }
 }
 
@@ skipping 110 matching lines @@
   std::unique_ptr<views::Button> section;
   PaymentSheetRowBuilder builder(
       this, GetShippingAddressSectionString(spec()->shipping_type()),
       widest_name_column_view_width_);
   builder.Tag(PaymentSheetViewControllerTags::SHOW_SHIPPING_BUTTON);
   if (state()->selected_shipping_profile()) {
     builder.Id(DialogViewID::PAYMENT_SHEET_SHIPPING_ADDRESS_SECTION);
     return builder.CreateWithChevron(CreateShippingSectionContent(), nullptr);
   } else {
     builder.Id(DialogViewID::PAYMENT_SHEET_SHIPPING_ADDRESS_SECTION_BUTTON);
-    base::string16 button_string = state()->shipping_profiles().size()
-                                       ? l10n_util::GetStringUTF16(IDS_CHOOSE)
-                                       : l10n_util::GetStringUTF16(IDS_ADD);
     if (state()->shipping_profiles().empty()) {
-      return builder.CreateWithButton(base::ASCIIToUTF16(""), button_string,
+      // If the button is "Add", clicking it should navigate to the editor
+      // instead of the list.
+      builder.Tag(PaymentSheetViewControllerTags::ADD_SHIPPING_BUTTON);
+      return builder.CreateWithButton(base::ASCIIToUTF16(""),
+                                      l10n_util::GetStringUTF16(IDS_ADD),
                                       /*button_enabled=*/true);
     } else if (state()->shipping_profiles().size() == 1) {
       base::string16 truncated_content =
           state()->shipping_profiles()[0]->ConstructInferredLabel(
               {
                   autofill::ADDRESS_HOME_LINE1, autofill::ADDRESS_HOME_LINE2,
                   autofill::ADDRESS_HOME_CITY, autofill::ADDRESS_HOME_STATE,
                   autofill::ADDRESS_HOME_COUNTRY,
               },
               6, state()->GetApplicationLocale());
-      return builder.CreateWithButton(truncated_content, button_string,
+      return builder.CreateWithButton(truncated_content,
+                                      l10n_util::GetStringUTF16(IDS_CHOOSE),
                                       /*button_enabled=*/true);
     } else {
       base::string16 format = l10n_util::GetPluralStringFUTF16(
           IDS_PAYMENT_REQUEST_SHIPPING_ADDRESSES_PREVIEW,
           state()->shipping_profiles().size() - 1);
       base::string16 label =
           state()->shipping_profiles()[0]->ConstructInferredLabel(
               {
                   autofill::ADDRESS_HOME_LINE1, autofill::ADDRESS_HOME_LINE2,
                   autofill::ADDRESS_HOME_CITY, autofill::ADDRESS_HOME_STATE,
                   autofill::ADDRESS_HOME_COUNTRY,
               },
               6, state()->GetApplicationLocale());
-      return builder.CreateWithButton(
-          label, format, state()->shipping_profiles().size() - 1, button_string,
-          /*button_enabled=*/true);
+      return builder.CreateWithButton(label, format,
+                                      state()->shipping_profiles().size() - 1,
+                                      l10n_util::GetStringUTF16(IDS_CHOOSE),
+                                      /*button_enabled=*/true);
     }
   }
 }
 
 // Creates the Payment Method row, which contains a "Payment" label, the user's
 // masked Credit Card details, the icon for the selected card, and a chevron.
 // If no option is selected or none is available, the Chevron and icon are
 // replaced with a button
 // +----------------------------------------------+
 // | Payment         Visa ****0000                |
@@ skipping 33 matching lines @@
     layout->AddView(selected_instrument_sublabel.release());
 
     std::unique_ptr<views::ImageView> card_icon_view = CreateInstrumentIconView(
         selected_instrument->icon_resource_id(), selected_instrument->label());
     card_icon_view->SetImageSize(gfx::Size(32, 20));
 
     return builder.Id(DialogViewID::PAYMENT_SHEET_PAYMENT_METHOD_SECTION)
         .CreateWithChevron(std::move(content_view), std::move(card_icon_view));
   } else {
     builder.Id(DialogViewID::PAYMENT_SHEET_PAYMENT_METHOD_SECTION_BUTTON);
-    base::string16 button_string = state()->available_instruments().size()
-                                       ? l10n_util::GetStringUTF16(IDS_CHOOSE)
-                                       : l10n_util::GetStringUTF16(IDS_ADD);
-
     if (state()->available_instruments().empty()) {
-      return builder.CreateWithButton(base::ASCIIToUTF16(""), button_string,
+      // If the button is "Add", navigate to the editor directly.
+      builder.Tag(PaymentSheetViewControllerTags::ADD_PAYMENT_METHOD_BUTTON);
+      return builder.CreateWithButton(base::ASCIIToUTF16(""),
+                                      l10n_util::GetStringUTF16(IDS_ADD),
                                       /*button_enabled=*/true);
     } else if (state()->available_instruments().size() == 1) {
       return builder.CreateWithButton(
-          state()->available_instruments()[0]->label(), button_string,
+          state()->available_instruments()[0]->label(),
+          l10n_util::GetStringUTF16(IDS_CHOOSE),
           /*button_enabled=*/true);
     } else {
       base::string16 format = l10n_util::GetPluralStringFUTF16(
           IDS_PAYMENT_REQUEST_PAYMENT_METHODS_PREVIEW,
           state()->available_instruments().size() - 1);
       return builder.CreateWithButton(
           state()->available_instruments()[0]->label(), format,
-          state()->available_instruments().size() - 1, button_string,
+          state()->available_instruments().size() - 1,
+          l10n_util::GetStringUTF16(IDS_CHOOSE),
           /*button_enabled=*/true);
     }
   }
 }
 
 std::unique_ptr<views::View>
 PaymentSheetViewController::CreateContactInfoSectionContent() {
   autofill::AutofillProfile* profile = state()->selected_contact_profile();
   return profile
              ? payments::GetContactInfoLabel(
@@ skipping 15 matching lines @@
       this,
       l10n_util::GetStringUTF16(IDS_PAYMENT_REQUEST_CONTACT_INFO_SECTION_NAME),
       widest_name_column_view_width_);
   builder.Tag(PaymentSheetViewControllerTags::SHOW_CONTACT_INFO_BUTTON);
 
   if (state()->selected_contact_profile()) {
     return builder.Id(DialogViewID::PAYMENT_SHEET_CONTACT_INFO_SECTION)
         .CreateWithChevron(CreateContactInfoSectionContent(), nullptr);
   } else {
     builder.Id(DialogViewID::PAYMENT_SHEET_CONTACT_INFO_SECTION_BUTTON);
-    base::string16 button_string = state()->contact_profiles().size()
-                                       ? l10n_util::GetStringUTF16(IDS_CHOOSE)
-                                       : l10n_util::GetStringUTF16(IDS_ADD);
-
     if (state()->contact_profiles().empty()) {
-      return builder.CreateWithButton(base::ASCIIToUTF16(""), button_string,
+      // If the button is "Add", navigate directly to the editor.
+      builder.Tag(PaymentSheetViewControllerTags::ADD_CONTACT_INFO_BUTTON);
+      return builder.CreateWithButton(base::ASCIIToUTF16(""),
+                                      l10n_util::GetStringUTF16(IDS_ADD),
                                       /*button_enabled=*/true);
     } else if (state()->contact_profiles().size() == 1) {
       base::string16 truncated_content =
           state()->contact_profiles()[0]->ConstructInferredLabel(
               {
                   autofill::ADDRESS_HOME_LINE1, autofill::ADDRESS_HOME_LINE2,
                   autofill::ADDRESS_HOME_CITY, autofill::ADDRESS_HOME_STATE,
                   autofill::ADDRESS_HOME_COUNTRY,
               },
               6, state()->GetApplicationLocale());
-      return builder.CreateWithButton(truncated_content, button_string,
+      return builder.CreateWithButton(truncated_content,
+                                      l10n_util::GetStringUTF16(IDS_CHOOSE),
                                       /*button_enabled=*/true);
     } else {
       base::string16 preview =
           state()->contact_profiles()[0]->ConstructInferredLabel(
               {
                   autofill::ADDRESS_HOME_LINE1, autofill::ADDRESS_HOME_LINE2,
                   autofill::ADDRESS_HOME_CITY, autofill::ADDRESS_HOME_STATE,
                   autofill::ADDRESS_HOME_COUNTRY,
               },
               6, state()->GetApplicationLocale());
       base::string16 format = l10n_util::GetPluralStringFUTF16(
           IDS_PAYMENT_REQUEST_CONTACTS_PREVIEW,
           state()->contact_profiles().size() - 1);
-      return builder.CreateWithButton(preview, format,
-                                      state()->contact_profiles().size() - 1,
-                                      button_string, /*button_enabled=*/true);
+      return builder.CreateWithButton(
+          preview, format, state()->contact_profiles().size() - 1,
+          l10n_util::GetStringUTF16(IDS_CHOOSE), /*button_enabled=*/true);
     }
   }
 }
 
 std::unique_ptr<views::Button>
 PaymentSheetViewController::CreateShippingOptionRow() {
   // The Shipping Options row has many different ways of being displayed
   // depending on the state of the dialog and Payment Request.
   // 1. There is a selected shipping address. The website updated the shipping
   //    options.
@@ skipping 46 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