[WebPayments] Add the Payment Method section in the Payment Sheet

chrome/browser/ui/views/payments/payment_request_views_util.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_request_views_util.h"
 
 #include "base/memory/ptr_util.h"
 #include "chrome/app/vector_icons/vector_icons.h"
 #include "chrome/browser/ui/views/payments/payment_request_sheet_controller.h"
 #include "third_party/skia/include/core/SkColor.h"
@@ skipping 15 matching lines @@
   views::GridLayout* layout = new views::GridLayout(container.get());
   container->SetLayoutManager(layout);
 
   views::ColumnSet* columns = layout->AddColumnSet(0);
   // A column for the optional back arrow.
   columns->AddColumn(views::GridLayout::LEADING, views::GridLayout::CENTER,
                      0, views::GridLayout::USE_PREF, 0, 0);
   // A column for the title.
   columns->AddColumn(views::GridLayout::FILL, views::GridLayout::CENTER,
                      1, views::GridLayout::USE_PREF, 0, 0);
-  // A column for the close button.
-  columns->AddColumn(views::GridLayout::TRAILING, views::GridLayout::CENTER,
-                     0, views::GridLayout::USE_PREF, 0, 0);
 
   layout->StartRow(0, 0);
   if (!show_back_arrow) {
     layout->SkipColumns(1);
   } else {
     views::VectorIconButton* back_arrow = new views::VectorIconButton(delegate);
     back_arrow->SetIcon(kNavigateBackIcon);
     back_arrow->SetSize(back_arrow->GetPreferredSize());
     back_arrow->set_tag(static_cast<int>(
         PaymentRequestCommonTags::BACK_BUTTON_TAG));
     layout->AddView(back_arrow);
   }
 
   views::Label* title_label = new views::Label(title);
   title_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   layout->AddView(title_label);
-  views::Button* close_button =
-      views::BubbleFrameView::CreateCloseButton(delegate);
-  close_button->set_tag(static_cast<int>(
-      PaymentRequestCommonTags::CLOSE_BUTTON_TAG));
-  layout->AddView(close_button);
 
   return container;
 }
 
 
 std::unique_ptr<views::View> CreatePaymentView(
     std::unique_ptr<views::View> header_view,
     std::unique_ptr<views::View> content_view) {
   std::unique_ptr<views::View> view = base::MakeUnique<views::View>();
   view->set_background(views::Background::CreateSolidBackground(SK_ColorWHITE));
@@ skipping 19 matching lines @@
   layout->AddView(header_view.release());
 
   layout->StartRow(0, 0);
   // |content_view| will be deleted when |view| is.
   layout->AddView(content_view.release());
 
   return view;
 }
 
 }  // namespace payments