[Web Payments] Add Cancel button to all sheets

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

+// Copyright 2017 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_sheet_controller.h"
+
+#include "chrome/browser/ui/views/payments/payment_request_dialog_view.h"
+#include "chrome/browser/ui/views/payments/payment_request_views_util.h"
+#include "components/strings/grit/components_strings.h"
+#include "ui/base/l10n/l10n_util.h"
+#include "ui/views/background.h"
+#include "ui/views/controls/button/md_text_button.h"
+#include "ui/views/layout/box_layout.h"
+#include "ui/views/layout/grid_layout.h"
+
+
+namespace payments {
+
+PaymentRequestSheetController::PaymentRequestSheetController(
+    PaymentRequest* request, PaymentRequestDialogView* dialog)
+  : request_(request), dialog_(dialog) {
+  DCHECK(request_);
+  DCHECK(dialog_);
+}
+
+std::unique_ptr<views::Button>
+PaymentRequestSheetController::CreatePrimaryButton() {

[Mathieu, 2017/02/02 21:04:58]

should we make this abstract and ask every controller to implement it? I feel
like it could lead to fewer bugs. I could be swayed though

[anthonyvd, 2017/02/02 21:33:24]

That's a good question, I was hesitating between that and having the base class
return the "Pay" button since that's the default one. Considering I wasn't ready
to implement a proper "Pay" yet, I went with the empty unique_ptr for now.

I think returning Pay here and Done in the base editor controller + empty
unique_ptr in the couple of screens that have no button would be ideal in terms
of not repeating ourselves. WDYT?

[Mathieu, 2017/02/02 21:44:15]

Yeah it certainly works and it's not a huge change if we ever regret it :) sgtm

+  return std::unique_ptr<views::Button>();
+}
+
+void PaymentRequestSheetController::ButtonPressed(
+    views::Button* sender, const ui::Event& event) {
+  switch (sender->tag()) {
+    case static_cast<int>(PaymentRequestCommonTags::CLOSE_BUTTON_TAG):
+      dialog()->CloseDialog();
+      break;
+    case static_cast<int>(PaymentRequestCommonTags::BACK_BUTTON_TAG):
+      dialog()->GoBack();
+      break;
+    default:
+      break;
+  }
+}
+
+std::unique_ptr<views::View> PaymentRequestSheetController::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));
+
+  // Paint the sheets to layers, otherwise the MD buttons (which do paint to a
+  // layer) won't do proper clipping.
+  view->SetPaintToLayer();
+
+  views::GridLayout* layout = new views::GridLayout(view.get());
+  view->SetLayoutManager(layout);
+
+  constexpr int kTopInsetSize = 9;
+  constexpr int kBottomInsetSize = 18;
+  layout->SetInsets(kTopInsetSize, 0, kBottomInsetSize, 0);
+  views::ColumnSet* columns = layout->AddColumnSet(0);
+  columns->AddColumn(views::GridLayout::FILL, views::GridLayout::CENTER,
+                     1, views::GridLayout::USE_PREF, 0, 0);
+
+  layout->StartRow(0, 0);
+  // |header_view| will be deleted when |view| is.
+  layout->AddView(header_view.release());
+
+  layout->StartRow(0, 0);
+  // |content_view| will be deleted when |view| is.
+  layout->AddView(content_view.release());
+
+  layout->AddPaddingRow(1, 0);
+  layout->StartRow(0, 0);
+  layout->AddView(CreateFooterView().release());
+
+  return view;
+}
+
+std::unique_ptr<views::View> PaymentRequestSheetController::CreateFooterView() {
+  std::unique_ptr<views::View> container = base::MakeUnique<views::View>();
+
+  views::GridLayout* layout = new views::GridLayout(container.get());
+  container->SetLayoutManager(layout);
+
+  views::ColumnSet* columns = layout->AddColumnSet(0);
+  columns->AddColumn(views::GridLayout::LEADING, views::GridLayout::CENTER,
+                     0, views::GridLayout::USE_PREF, 0, 0);
+  columns->AddPaddingColumn(1, 0);
+  columns->AddColumn(views::GridLayout::TRAILING, views::GridLayout::CENTER,
+                     0, views::GridLayout::USE_PREF, 0, 0);
+
+  layout->StartRow(0, 0);
+  std::unique_ptr<views::View> leading_buttons_container =
+      base::MakeUnique<views::View>();
+
+  // TODO(anthonyvd): Add the other buttons that can eventually go into this
+  // footer.
+
+  layout->AddView(leading_buttons_container.release());
+
+  std::unique_ptr<views::View> trailing_buttons_container =
+      base::MakeUnique<views::View>();
+
+  constexpr int kButtonSpacing = 10;
+  trailing_buttons_container->SetLayoutManager(new views::BoxLayout(
+      views::BoxLayout::kHorizontal,
+      kPaymentRequestRowHorizontalInsets,
+      kPaymentRequestRowVerticalInsets,
+      kButtonSpacing));
+
+  std::unique_ptr<views::Button> primary_button = CreatePrimaryButton();
+  if (primary_button)
+    trailing_buttons_container->AddChildView(primary_button.release());
+
+  views::LabelButton* button = views::MdTextButton::CreateSecondaryUiButton(
+      this, l10n_util::GetStringUTF16(IDS_CANCEL));
+  button->set_tag(static_cast<int>(PaymentRequestCommonTags::CLOSE_BUTTON_TAG));
+  trailing_buttons_container->AddChildView(button);
+
+  layout->AddView(trailing_buttons_container.release());
+
+  return container;
+}
+
+}  // namespace payments