Broke out layout metric information from ViewsDelegate to LayoutProvider

ui/views/views_delegate.cc

 // Copyright (c) 2013 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/views_delegate.h"
 
 #include "base/command_line.h"
 #include "build/build_config.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/views_touch_selection_controller_factory.h"
 #include "ui/views/widget/native_widget_private.h"
 
 #if defined(USE_AURA)
 #include "ui/views/touchui/touch_selection_menu_runner_views.h"
 #endif
 
 namespace views {
 namespace {
 
 ViewsDelegate* views_delegate = nullptr;
 
 }
 
+ViewsDelegate::ViewsDelegate()
+    : views_tsc_factory_(new ViewsTouchEditingControllerFactory) {
+  DCHECK(!views_delegate);
+  views_delegate = this;
+
+  ui::TouchEditingControllerFactory::SetInstance(views_tsc_factory_.get());
+
+#if defined(USE_AURA)
+  touch_selection_menu_runner_.reset(new TouchSelectionMenuRunnerViews());

[Peter Kasting, 2017/03/24 22:51:13]

Nit: Prefer =MakeUnique to reset(new

(That said, I just realized you were moving this code rather than rewriting, so
whatever)

+#endif
+}
+
 ViewsDelegate::~ViewsDelegate() {
   ui::TouchEditingControllerFactory::SetInstance(nullptr);
 
   DCHECK_EQ(this, views_delegate);
   views_delegate = nullptr;
 }
 
 ViewsDelegate* ViewsDelegate::GetInstance() {
   return views_delegate;
 }
@@ skipping 85 matching lines @@
 int ViewsDelegate::GetAppbarAutohideEdges(HMONITOR monitor,
                                           const base::Closure& callback) {
   return EDGE_BOTTOM;
 }
 #endif
 
 scoped_refptr<base::TaskRunner> ViewsDelegate::GetBlockingPoolTaskRunner() {
   return nullptr;
 }
 
-gfx::Insets ViewsDelegate::GetInsetsMetric(InsetsMetric metric) const {
-  switch (metric) {
-    case InsetsMetric::DIALOG_BUTTON:
-      return gfx::Insets(0, kButtonHEdgeMarginNew, kButtonVEdgeMarginNew,
-                         kButtonHEdgeMarginNew);
-    case InsetsMetric::DIALOG_FRAME_VIEW:
-      return gfx::Insets(kPanelVertMargin, kButtonHEdgeMarginNew, 0,
-                         kButtonHEdgeMarginNew);
-    case InsetsMetric::BUBBLE_DIALOG:
-      return gfx::Insets(kPanelVertMargin, kPanelHorizMargin);
-  }
-  NOTREACHED();
-  return gfx::Insets();
-}
-
-int ViewsDelegate::GetDistanceMetric(DistanceMetric metric) const {
-  switch (metric) {
-    case DistanceMetric::CLOSE_BUTTON_MARGIN:
-      return kCloseButtonMargin;
-    case DistanceMetric::RELATED_BUTTON_HORIZONTAL:
-      return kRelatedButtonHSpacing;
-    case DistanceMetric::RELATED_CONTROL_HORIZONTAL:
-      return kRelatedControlHorizontalSpacing;
-    case DistanceMetric::RELATED_CONTROL_VERTICAL:
-      return kRelatedControlVerticalSpacing;
-    case DistanceMetric::DIALOG_BUTTON_MINIMUM_WIDTH:
-      return kDialogMinimumButtonWidth;
-    case DistanceMetric::BUTTON_HORIZONTAL_PADDING:
-      return kButtonHorizontalPadding;
-  }
-  NOTREACHED();
-  return 0;
-}
-
-ViewsDelegate::ViewsDelegate()
-    : views_tsc_factory_(new ViewsTouchEditingControllerFactory) {
-  DCHECK(!views_delegate);
-  views_delegate = this;
-
-  ui::TouchEditingControllerFactory::SetInstance(views_tsc_factory_.get());
-
-#if defined(USE_AURA)
-  touch_selection_menu_runner_.reset(new TouchSelectionMenuRunnerViews());
-#endif
-}
-
 }  // namespace views