[Web Payments] UI tweaks to desktop editors

chrome/browser/ui/views/payments/editor_view_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/editor_view_controller.h"
 
 #include <map>
 #include <memory>
 #include <utility>
 
@@ skipping 115 matching lines @@
 
   // An editor can optionally have a header view specific to it.
   std::unique_ptr<views::View> header_view = CreateHeaderView();
   if (header_view.get())
     content_view->AddChildView(header_view.release());
 
   // The heart of the editor dialog: all the input fields with their labels.
   content_view->AddChildView(CreateEditorView().release());
 }
 
-// Adds the "required fields" label in disabled text, to obtain this result.
-// +---------------------------------------------------------+
-// | "* indicates required fields"           | CANCEL | DONE |
-// +---------------------------------------------------------+
-std::unique_ptr<views::View> EditorViewController::CreateExtraFooterView() {
-  std::unique_ptr<views::View> content_view = base::MakeUnique<views::View>();
-
-  views::BoxLayout* layout =
-      new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, 0);
-  layout->set_main_axis_alignment(views::BoxLayout::MAIN_AXIS_ALIGNMENT_START);
-  layout->set_cross_axis_alignment(
-      views::BoxLayout::CROSS_AXIS_ALIGNMENT_START);
-  content_view->SetLayoutManager(layout);
-
-  // Adds the "* indicates a required field" label in "disabled" grey text.
-  std::unique_ptr<views::Label> label = base::MakeUnique<views::Label>(
-      l10n_util::GetStringUTF16(IDS_PAYMENTS_REQUIRED_FIELD_MESSAGE));
-  label->SetDisabledColor(label->GetNativeTheme()->GetSystemColor(
-      ui::NativeTheme::kColorId_LabelDisabledColor));
-  label->SetEnabled(false);
-  content_view->AddChildView(label.release());
-  return content_view;
+base::string16 EditorViewController::GetSecondaryButtonLabel() {
+  return l10n_util::GetStringUTF16(IDS_PAYMENTS_CANCEL_PAYMENT);
 }
 
 void EditorViewController::UpdateEditorView() {
   UpdateContentView();
   // TODO(crbug.com/704254): Find how to update the parent view bounds so that
   // the vertical scrollbar size gets updated.
   dialog()->EditorViewUpdated();
 }
 
 void EditorViewController::ButtonPressed(views::Button* sender,
@@ skipping 49 matching lines @@
   columns->AddColumn(views::GridLayout::LEADING, views::GridLayout::CENTER, 0,
                      views::GridLayout::USE_PREF, 0, 0);
 
   // This is the horizontal padding between the label and the input field.
   constexpr int kLabelInputFieldHorizontalPadding = 16;
   columns->AddPaddingColumn(0, kLabelInputFieldHorizontalPadding);
 
   columns->AddColumn(views::GridLayout::LEADING, views::GridLayout::CENTER, 0,
                      views::GridLayout::USE_PREF, 0, 0);
 
-  editor_view->SetLayoutManager(editor_layout.release());
   std::vector<EditorField> fields = GetFieldDefinitions();
   for (const auto& field : fields) {

[Mathieu, 2017/05/11 18:15:14]

no curlz

[anthonyvd, 2017/05/11 21:21:50]

Done.

-    CreateInputField(
-        static_cast<views::GridLayout*>(editor_view->GetLayoutManager()),
-        field);
+    CreateInputField(editor_layout.get(), field);
   }
 
+  // Adds the "* indicates a required field" label in "disabled" grey text.
+  std::unique_ptr<views::Label> required_field = base::MakeUnique<views::Label>(
+      l10n_util::GetStringUTF16(IDS_PAYMENTS_REQUIRED_FIELD_MESSAGE));
+  required_field->SetDisabledColor(
+      required_field->GetNativeTheme()->GetSystemColor(
+          ui::NativeTheme::kColorId_LabelDisabledColor));
+  required_field->SetEnabled(false);
+
+  views::ColumnSet* required_field_columns = editor_layout->AddColumnSet(1);

[Mathieu, 2017/05/11 18:15:14]

I think you'll need a big rebase

[anthonyvd, 2017/05/11 21:21:50]

Done.

+  required_field_columns->AddColumn(views::GridLayout::LEADING,
+                                    views::GridLayout::CENTER, 1,
+                                    views::GridLayout::USE_PREF, 0, 0);
+  editor_layout->StartRow(0, 1);
+  editor_layout->AddView(required_field.release());
+
+  editor_view->SetLayoutManager(editor_layout.release());
+
   return editor_view;
 }
 
 // Each input field is a 4-quadrant grid.
 // +----------------------------------------------------------+
 // | Field Label           | Input field (textfield/combobox) |
 // |_______________________|__________________________________|
 // |   (empty)             | Error label                      |
 // +----------------------------------------------------------+
 void EditorViewController::CreateInputField(views::GridLayout* layout,
@@ skipping 54 matching lines @@
       base::MakeUnique<views::View>();
   error_label_view->SetLayoutManager(new views::FillLayout);
   error_labels_[field] = error_label_view.get();
   layout->AddView(error_label_view.release());
 
   // Bottom padding for the row.
   layout->AddPaddingRow(0, kInputRowSpacing);
 }
 
 }  // namespace payments