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

BUG=710977

Review-Url: https://codereview.chromium.org/2854973002
Cr-Commit-Position: refs/heads/master@{#468943}

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

@@ -38,7 +38,6 @@ class PaymentRequestContactInfoEditorTest
 
 IN_PROC_BROWSER_TEST_F(PaymentRequestContactInfoEditorTest, HappyPath) {
   InvokePaymentRequestUI();
-  OpenContactInfoScreen();
   OpenContactInfoEditorScreen();
 
   SetEditorTextfieldValue(base::ASCIIToUTF16(kNameFull), autofill::NAME_FULL);
@@ -75,7 +74,6 @@ IN_PROC_BROWSER_TEST_F(PaymentRequestContactInfoEditorTest, HappyPath) {
 
 IN_PROC_BROWSER_TEST_F(PaymentRequestContactInfoEditorTest, Validation) {
   InvokePaymentRequestUI();
-  OpenContactInfoScreen();
   OpenContactInfoEditorScreen();
 
   // Insert invalid values into fields which have rules more complex than

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

@@ -54,8 +54,6 @@ IN_PROC_BROWSER_TEST_F(PaymentRequestCreditCardEditorTest, EnteringValidData) {
   EXPECT_EQ(0U, request->state()->available_instruments().size());
   EXPECT_EQ(nullptr, request->state()->selected_instrument());
 
-  OpenPaymentMethodScreen();
-
   OpenCreditCardEditorScreen();
 
   SetEditorTextfieldValue(base::ASCIIToUTF16("Bob Jones"),
@@ -97,8 +95,6 @@ IN_PROC_BROWSER_TEST_F(PaymentRequestCreditCardEditorTest, EnteringValidData) {
 IN_PROC_BROWSER_TEST_F(PaymentRequestCreditCardEditorTest, CancelFromEditor) {
   InvokePaymentRequestUI();
 
-  OpenPaymentMethodScreen();
-
   OpenCreditCardEditorScreen();
 
   ResetEventObserver(DialogEvent::DIALOG_CLOSED);
@@ -114,8 +110,6 @@ IN_PROC_BROWSER_TEST_F(PaymentRequestCreditCardEditorTest,
 
   InvokePaymentRequestUI();
 
-  OpenPaymentMethodScreen();
-
   OpenCreditCardEditorScreen();
 
   SetEditorTextfieldValue(base::ASCIIToUTF16("Bob Jones"),
@@ -147,8 +141,6 @@ IN_PROC_BROWSER_TEST_F(PaymentRequestCreditCardEditorTest,
 
   InvokePaymentRequestUI();
 
-  OpenPaymentMethodScreen();
-
   OpenCreditCardEditorScreen();
 
   // This field is required. Entering nothing and blurring out will show
@@ -183,8 +175,6 @@ IN_PROC_BROWSER_TEST_F(PaymentRequestCreditCardEditorTest,
 
   InvokePaymentRequestUI();
 
-  OpenPaymentMethodScreen();
-
   OpenCreditCardEditorScreen();
 
   SetEditorTextfieldValue(base::ASCIIToUTF16("Bob Jones"),
@@ -216,8 +206,6 @@ IN_PROC_BROWSER_TEST_F(PaymentRequestCreditCardEditorTest,
 
   InvokePaymentRequestUI();
 
-  OpenPaymentMethodScreen();
-
   OpenCreditCardEditorScreen();
 
   SetEditorTextfieldValue(base::ASCIIToUTF16("Bob Jones"),
@@ -251,8 +239,6 @@ IN_PROC_BROWSER_TEST_F(PaymentRequestCreditCardEditorTest,
 
   InvokePaymentRequestUI();
 
-  OpenPaymentMethodScreen();
-
   OpenCreditCardEditorScreen();
 
   SetEditorTextfieldValue(base::ASCIIToUTF16("Bob Jones"),
@@ -374,8 +360,6 @@ IN_PROC_BROWSER_TEST_F(PaymentRequestCreditCardEditorTest, EditingExpiredCard) {
 IN_PROC_BROWSER_TEST_F(PaymentRequestCreditCardEditorTest, EnteringEmptyData) {
   InvokePaymentRequestUI();
 
-  OpenPaymentMethodScreen();
-
   OpenCreditCardEditorScreen();
 
   // Setting empty data and unfocusing a required textfield will make it

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

@@ -23,16 +23,6 @@ class PaymentMethodViewControllerTest : public PaymentRequestBrowserTestBase {
   DISALLOW_COPY_AND_ASSIGN(PaymentMethodViewControllerTest);
 };
 
-IN_PROC_BROWSER_TEST_F(PaymentMethodViewControllerTest, EmptyList) {
-  InvokePaymentRequestUI();
-  OpenPaymentMethodScreen();
-
-  views::View* list_view = dialog_view()->GetViewByID(
-      static_cast<int>(DialogViewID::PAYMENT_METHOD_SHEET_LIST_VIEW));
-  EXPECT_TRUE(list_view);
-  EXPECT_FALSE(list_view->has_children());
-}
-
 IN_PROC_BROWSER_TEST_F(PaymentMethodViewControllerTest, OneCardSelected) {
   const autofill::CreditCard card = autofill::test::GetCreditCard();
   AddCreditCard(card);

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

@@ -286,19 +286,43 @@ void PaymentRequestBrowserTestBase::OpenContactInfoScreen() {
 void PaymentRequestBrowserTestBase::OpenCreditCardEditorScreen() {
   ResetEventObserver(DialogEvent::CREDIT_CARD_EDITOR_OPENED);
 
-  ClickOnDialogViewAndWait(DialogViewID::PAYMENT_METHOD_ADD_CARD_BUTTON);
+  views::View* view = delegate_->dialog_view()->GetViewByID(
+      static_cast<int>(DialogViewID::PAYMENT_METHOD_ADD_CARD_BUTTON));
+  if (!view) {
+    view = delegate_->dialog_view()->GetViewByID(static_cast<int>(
+        DialogViewID::PAYMENT_SHEET_PAYMENT_METHOD_SECTION_BUTTON));
+  }
+
+  EXPECT_TRUE(view);
+  ClickOnDialogViewAndWait(view);
 }
 
 void PaymentRequestBrowserTestBase::OpenShippingAddressEditorScreen() {
   ResetEventObserver(DialogEvent::SHIPPING_ADDRESS_EDITOR_OPENED);
 
-  ClickOnDialogViewAndWait(DialogViewID::PAYMENT_METHOD_ADD_SHIPPING_BUTTON);
+  views::View* view = delegate_->dialog_view()->GetViewByID(
+      static_cast<int>(DialogViewID::PAYMENT_METHOD_ADD_SHIPPING_BUTTON));
+  if (!view) {
+    view = delegate_->dialog_view()->GetViewByID(static_cast<int>(
+        DialogViewID::PAYMENT_SHEET_SHIPPING_ADDRESS_SECTION_BUTTON));
+  }
+
+  EXPECT_TRUE(view);
+  ClickOnDialogViewAndWait(view);
 }
 
 void PaymentRequestBrowserTestBase::OpenContactInfoEditorScreen() {
   ResetEventObserver(DialogEvent::CONTACT_INFO_EDITOR_OPENED);
 
-  ClickOnDialogViewAndWait(DialogViewID::PAYMENT_METHOD_ADD_CONTACT_BUTTON);
+  views::View* view = delegate_->dialog_view()->GetViewByID(
+      static_cast<int>(DialogViewID::PAYMENT_METHOD_ADD_CONTACT_BUTTON));
+  if (!view) {
+    view = delegate_->dialog_view()->GetViewByID(static_cast<int>(
+        DialogViewID::PAYMENT_SHEET_CONTACT_INFO_SECTION_BUTTON));
+  }
+
+  EXPECT_TRUE(view);
+  ClickOnDialogViewAndWait(view);
 }
 
 void PaymentRequestBrowserTestBase::ClickOnBackArrow() {

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

@@ -55,13 +55,16 @@ 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
 };
 
@@ -485,16 +488,41 @@ void PaymentSheetViewController::ButtonPressed(
       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();
@@ -626,11 +654,12 @@ std::unique_ptr<views::Button> PaymentSheetViewController::CreateShippingRow() {
     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 =
@@ -641,7 +670,8 @@ std::unique_ptr<views::Button> PaymentSheetViewController::CreateShippingRow() {
                   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(
@@ -655,9 +685,10 @@ std::unique_ptr<views::Button> PaymentSheetViewController::CreateShippingRow() {
                   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);
     }
   }
 }
@@ -711,16 +742,16 @@ PaymentSheetViewController::CreatePaymentMethodRow() {
         .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(
@@ -728,7 +759,8 @@ PaymentSheetViewController::CreatePaymentMethodRow() {
           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);
     }
   }
@@ -764,12 +796,11 @@ PaymentSheetViewController::CreateContactInfoRow() {
         .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 =
@@ -780,7 +811,8 @@ PaymentSheetViewController::CreateContactInfoRow() {
                   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 =
@@ -794,9 +826,9 @@ PaymentSheetViewController::CreateContactInfoRow() {
       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);
     }
   }
 }

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

@@ -141,7 +141,6 @@ class PaymentRequestShippingAddressEditorTest
 IN_PROC_BROWSER_TEST_F(PaymentRequestShippingAddressEditorTest, SyncData) {
   InvokePaymentRequestUI();
   SetRegionDataLoader(&test_region_data_loader_);
-  OpenShippingAddressSectionScreen();
 
   // No shipping profiles are available.
   PaymentRequest* request = GetPaymentRequests(GetActiveWebContents()).front();
@@ -183,7 +182,6 @@ IN_PROC_BROWSER_TEST_F(PaymentRequestShippingAddressEditorTest, SyncData) {
 IN_PROC_BROWSER_TEST_F(PaymentRequestShippingAddressEditorTest, AsyncData) {
   InvokePaymentRequestUI();
   SetRegionDataLoader(&test_region_data_loader_);
-  OpenShippingAddressSectionScreen();
 
   test_region_data_loader_.set_synchronous_callback(false);
   OpenShippingAddressEditorScreen();
@@ -229,7 +227,6 @@ IN_PROC_BROWSER_TEST_F(PaymentRequestShippingAddressEditorTest,
                        SwitchingCountryUpdatesViewAndKeepsValues) {
   InvokePaymentRequestUI();
   SetRegionDataLoader(&test_region_data_loader_);
-  OpenShippingAddressSectionScreen();
 
   test_region_data_loader_.set_synchronous_callback(false);
   OpenShippingAddressEditorScreen();
@@ -327,7 +324,6 @@ IN_PROC_BROWSER_TEST_F(PaymentRequestShippingAddressEditorTest,
                        FailToLoadRegionData) {
   InvokePaymentRequestUI();
   SetRegionDataLoader(&test_region_data_loader_);
-  OpenShippingAddressSectionScreen();
 
   // The synchronous callback is made with no data, which causes a failure.
   test_region_data_loader_.set_synchronous_callback(true);
@@ -364,7 +360,6 @@ IN_PROC_BROWSER_TEST_F(PaymentRequestShippingAddressEditorTest,
                        TimingOutRegionData) {
   InvokePaymentRequestUI();
   SetRegionDataLoader(&test_region_data_loader_);
-  OpenShippingAddressSectionScreen();
 
   test_region_data_loader_.set_synchronous_callback(false);
   OpenShippingAddressEditorScreen();