Views/Harmony: Replace layout constants in chrome/browser/ui/views/extensions.

chrome/browser/ui/views/extensions/bookmark_app_confirmation_view.cc

Index: chrome/browser/ui/views/extensions/bookmark_app_confirmation_view.cc
diff --git a/chrome/browser/ui/views/extensions/bookmark_app_confirmation_view.cc b/chrome/browser/ui/views/extensions/bookmark_app_confirmation_view.cc
index a2d3043363fd73b00732cc491b0aed535701fbdd..c6fb82a37b22746b3e1916c7db5790a64bb8f5ff 100644
--- a/chrome/browser/ui/views/extensions/bookmark_app_confirmation_view.cc
+++ b/chrome/browser/ui/views/extensions/bookmark_app_confirmation_view.cc
@@ -8,6 +8,7 @@
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "build/build_config.h"
+#include "chrome/browser/ui/views/harmony/layout_delegate.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/constrained_window/constrained_window_views.h"
 #include "components/strings/grit/components_strings.h"
@@ -22,7 +23,6 @@
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/layout/box_layout.h"
-#include "ui/views/layout/layout_constants.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/dialog_client_view.h"
 
@@ -74,9 +74,11 @@ BookmarkAppConfirmationView::BookmarkAppConfirmationView(
       callback_(callback),
       open_as_window_checkbox_(nullptr),
       title_tf_(nullptr) {
-  views::BoxLayout* layout = new views::BoxLayout(
-      views::BoxLayout::kHorizontal, views::kButtonHEdgeMarginNew,
-      views::kButtonHEdgeMarginNew, views::kButtonHEdgeMarginNew);
+  const int button_margin = LayoutDelegate::Get()->GetMetric(
+      LayoutDelegate::Metric::DIALOG_BUTTON_MARGIN);
+  views::BoxLayout* layout =
+      new views::BoxLayout(views::BoxLayout::kHorizontal, button_margin,
+                           button_margin, button_margin);

[tapted, 2017/03/20 03:41:52]

The children here are not buttons :/, but I suppose in both pre- and pos-
Harmony the goal is to align with the button row of the dialog client view (it
should probably be PANEL_CONTENT_MARGIN :/..)

There's a mock at http://crbug.com/652510 but it's out of date :/

But the third argument should always have been
kUnrelatedControlLargeHorizontalSpacing


Anyway I think the right things to use here are:

DIALOG_BUTTON_MARGIN, PANEL_CONTENT_MARGIN, UNRELATED_CONTROL_HORIZONTAL_SPACING

With a comment

// Align the contents with the dialog buttons.


Using PANEL_CONTENT_MARGIN for the vertical margin will squish the dialog a bit
under non-Harmony, which will look fine. But using it for the horizontal margin
will misalign things (I think). Ideally we would use PANEL_CONTENT_MARGIN for
vertical and horizontal.

[Patti Lor, 2017/03/21 06:24:29]

Done.

   layout->set_cross_axis_alignment(
       views::BoxLayout::CROSS_AXIS_ALIGNMENT_CENTER);
   SetLayoutManager(layout);