[Payments] Only show the required rows in the Payment Request dialog

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 <utility>
 #include <vector>
@@ skipping 166 matching lines @@
 
 std::unique_ptr<views::View> PaymentSheetViewController::CreateView() {
   std::unique_ptr<views::View> content_view = base::MakeUnique<views::View>();
 
   views::GridLayout* layout = new views::GridLayout(content_view.get());
   content_view->SetLayoutManager(layout);
   views::ColumnSet* columns = layout->AddColumnSet(0);
   columns->AddColumn(views::GridLayout::FILL, views::GridLayout::CENTER,
                      1, views::GridLayout::USE_PREF, 0, 0);
 
+  // The shipping address and contact info rows are optional.
   layout->StartRow(0, 0);
   layout->AddView(CreatePaymentSheetSummaryRow().release());
-  layout->StartRow(1, 0);
-  layout->AddView(CreateShippingRow().release());
+  if (request()->request_shipping()) {
+    layout->StartRow(1, 0);
+    layout->AddView(CreateShippingRow().release());
+  }
   layout->StartRow(0, 0);
   layout->AddView(CreatePaymentMethodRow().release());
-  layout->StartRow(1, 0);
-  layout->AddView(CreateContactInfoRow().release());
+  if (request()->request_payer_name() || request()->request_payer_email() ||
+      request()->request_payer_phone()) {
+    layout->StartRow(1, 0);
+    layout->AddView(CreateContactInfoRow().release());
+  }
 
   return CreatePaymentView(
       CreateSheetHeaderView(
           false,
           l10n_util::GetStringUTF16(IDS_PAYMENT_REQUEST_PAYMENT_SHEET_TITLE),
           this),
       std::move(content_view));
 }
 
 std::unique_ptr<views::Button>
@@ skipping 183 matching lines @@
       CreateContactInfoSectionContent(), std::unique_ptr<views::View>(nullptr),
       widest_name_column_view_width_);
   section->set_tag(static_cast<int>(
       PaymentSheetViewControllerTags::SHOW_CONTACT_INFO_BUTTON));
   section->set_id(
       static_cast<int>(DialogViewID::PAYMENT_SHEET_CONTACT_INFO_SECTION));
   return section;
 }
 
 }  // namespace payments