Description: Views/Harmony Remove references to ui/views/layout/layout_constants.h

chrome/browser/ui/views/arc_app_dialog_view.cc

Index: chrome/browser/ui/views/arc_app_dialog_view.cc
diff --git a/chrome/browser/ui/views/arc_app_dialog_view.cc b/chrome/browser/ui/views/arc_app_dialog_view.cc
index 0f9c1af00c21aac80657bc44fe8192a9439d7bfd..d4e2840716ad87de158f983c0653e6b8fc8b8289 100644
--- a/chrome/browser/ui/views/arc_app_dialog_view.cc
+++ b/chrome/browser/ui/views/arc_app_dialog_view.cc
@@ -23,7 +23,6 @@
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/box_layout.h"
-#include "ui/views/layout/layout_constants.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/dialog_delegate.h"
@@ -138,11 +137,15 @@ ArcAppDialogView::ArcAppDialogView(Profile* profile,
   if (parent_)
     parent_window_tracker_ = NativeWindowTracker::Create(parent_);
 
+  ChromeLayoutProvider* provider = ChromeLayoutProvider::Get();
+
   SetLayoutManager(new views::BoxLayout(
-      views::BoxLayout::kHorizontal, views::kButtonHEdgeMarginNew,
-      ChromeLayoutProvider::Get()->GetDistanceMetric(
+      views::BoxLayout::kHorizontal,
+      provider->GetDistanceMetric(DISTANCE_DIALOG_BUTTON_MARGIN),
+      provider->GetDistanceMetric(
           DISTANCE_PANEL_CONTENT_MARGIN),

[ananta, 2017/05/09 02:35:42]

Wondering if we should simplify this to a CreatePanel with panel insets?

[Peter Kasting, 2017/05/10 22:47:42]

Right now CreatePanel() is only defined on GridLayout.  We probably don't want
to switch to GridLayout here.

You could do a separate CL that defines a similar function on BoxLayout and
switches everywhere applicable in the codebase to use it.  That would make sense
if there are multiple places wanting to do this, which I think there are.

You may end up wanting a BoxLayout constructor that takes insets rather than
just horizontal/vertical values while you're at it.

-      views::kRelatedControlHorizontalSpacing));
+      provider->GetDistanceMetric(
+          views::DISTANCE_RELATED_CONTROL_HORIZONTAL)));
 
   icon_view_ = new FixedBoundarySizeImageView();
   AddChildView(icon_view_);