Remove references to ui/views/layout/layout_constants.h

ui/views/layout/layout_provider.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 "ui/views/layout/layout_provider.h"
 
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "ui/base/material_design/material_design_controller.h"
-#include "ui/views/layout/layout_constants.h"
 #include "ui/views/views_delegate.h"
 
 namespace views {
 
 namespace {
+
 LayoutProvider* g_layout_delegate = nullptr;
-}
+
+constexpr int kPanelHorizMargin = 13;

[Peter Kasting, 2017/06/13 23:33:35]

Same comment.

[ananta, 2017/06/14 18:48:11]

Done.

+
+// Top or bottom margin.
+constexpr int kPanelVertMargin = 13;
+
+// Horizontal spacing between controls that are logically related.
+constexpr int kRelatedControlHorizontalSpacing = 8;
+
+// Vertical spacing between controls that are logically related.
+constexpr int kRelatedControlVerticalSpacing = 8;
+
+// Vertical spacing between controls that are logically unrelated.
+constexpr int kUnrelatedControlVerticalSpacing = 20;
+
+// Vertical spacing between the edge of the window and the
+// top or bottom of a button (when using new style dialogs).
+constexpr int kButtonVEdgeMarginNew = 20;
+
+// Horizontal spacing between the edge of the window and the
+// left or right of a button (when using new style dialogs).
+constexpr int kButtonHEdgeMarginNew = 20;
+
+// Spacing between the edge of the window and the edge of the close button.
+constexpr int kCloseButtonMargin = 7;
+
+// Horizontal spacing between buttons that are logically related.
+constexpr int kRelatedButtonHSpacing = 6;
+
+// Padding on the left and right of a button's contents.
+const int kButtonHorizontalPadding = 16;
+
+// Minimum width of dialog buttons.
+constexpr int kDialogMinimumButtonWidth = 75;
+
+// Extra space around vector buttons to increase their event target size.
+constexpr int kVectorButtonExtraTouchSize = 4;
+
+}  // namespace
 
 LayoutProvider::LayoutProvider() {
   g_layout_delegate = this;
 }
 
 LayoutProvider::~LayoutProvider() {
   if (this == g_layout_delegate)
     g_layout_delegate = nullptr;
 }
 
@@ skipping 81 matching lines @@
   // This is an arbitrary value, but it's a good arbitrary value. Some dialogs
   // have very small widths for their contents views, which causes ugly
   // title-wrapping where a two-word title is split across multiple lines or
   // similar. To prevent that, forbid any snappable dialog from being narrower
   // than this value. In principle it's possible to factor in the title width
   // here, but it is not really worth the complexity.
   return std::max(min_width, 320);
 }
 
 }  // namespace views