Create c/b/ui/views/layout_constants.*.

chrome/browser/ui/views/layout_constants.cc

+// Copyright 2015 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/layout_constants.h"
+
+#include "base/logging.h"
+#include "ui/base/resource/material_design/material_design_controller.h"
+
+int GetLayoutConstant(LayoutConstant constant) {
+  const int kIconLabelViewTrailingPadding[] = {2, 8, 8};

[jonross, 2015/09/14 15:27:10]

Do we want to bring in any of the comments in theme_properties.cc to document
what each of these are for?

[Peter Kasting, 2015/09/14 21:06:31]

I put those comments in the header file to document what the enums mean.  That
seems more appropriate.

+  const int kLocationBarBubbleHorizontalPadding[] = {1, 5, 5};
+  const int kLocationBarBubbleVerticalPadding[] = {1, 3, 3};
+  const int kLocationBarHeight[] = {0, 28, 32};
+  const int kLocationBarHorizontalPadding[] = {3, 6, 6};
+  const int kLocationBarVerticalPadding[] = {2, 6, 6};
+  const int kOmniboxDropdownBorderInterior[] = {6, 0, 0};
+  const int kToolbarViewContentShadowHeight[] = {0, 0, 0};
+  const int kToolbarViewContentShadowHeightAsh[] = {2, 0, 0};
+  const int kToolbarViewElementPadding[] = {0, 0, 8};
+  const int kToolbarViewLocationBarRightPadding[] = {0, 4, 8};
+  const int kToolbarViewStandardSpacing[] = {3, 4, 8};
+
+  const int mode = ui::MaterialDesignController::GetMode();

[jonross, 2015/09/14 15:27:09]

This will impact unittesting. 

The MaterialDesignController keeping the mode static has let bruthig@ to
introduce an uninitialize method to allow for testing:

https://codereview.chromium.org/1298513003/diff/180001/ui/views/animation/ink...

[Peter Kasting, 2015/09/14 21:06:31]

I'm not sure what you're asking me to do here.  The implementation of this is
the same as in ThemeProvider, where we ask the MaterialDesignController for the
mode, so I don't see how my change makes testing different than it previously
was.

[jonross, 2015/09/14 23:46:43]

Sorry for not providing the details.

In ThemeProvider it was not a const int:
int mode = ui::MaterialDesignController::GetMode()

so that changes during unittests would be reflected on subsequent polls for
layout constants.

[Peter Kasting, 2015/09/14 23:49:43]

This code is still fine from that perspective.  You're thinking of "static
const", this is non-static.

[jonross, 2015/09/15 14:37:08]

Sorry, my mistake.

+  switch (constant) {
+    case ICON_LABEL_VIEW_TRAILING_PADDING:
+      return kIconLabelViewTrailingPadding[mode];
+    case LOCATION_BAR_BUBBLE_HORIZONTAL_PADDING:
+      return kLocationBarBubbleHorizontalPadding[mode];
+    case LOCATION_BAR_BUBBLE_VERTICAL_PADDING:
+      return kLocationBarBubbleVerticalPadding[mode];
+    case LOCATION_BAR_HEIGHT:
+      return kLocationBarHeight[mode];
+    case LOCATION_BAR_HORIZONTAL_PADDING:
+      return kLocationBarHorizontalPadding[mode];
+    case LOCATION_BAR_VERTICAL_PADDING:
+      return kLocationBarVerticalPadding[mode];
+    case OMNIBOX_DROPDOWN_BORDER_INTERIOR:
+      return kOmniboxDropdownBorderInterior[mode];
+    case TOOLBAR_VIEW_CONTENT_SHADOW_HEIGHT:
+      return kToolbarViewContentShadowHeight[mode];
+    case TOOLBAR_VIEW_CONTENT_SHADOW_HEIGHT_ASH:
+      return kToolbarViewContentShadowHeightAsh[mode];
+    case TOOLBAR_VIEW_ELEMENT_PADDING:
+      return kToolbarViewElementPadding[mode];
+    case TOOLBAR_VIEW_LOCATION_BAR_RIGHT_PADDING:
+      return kToolbarViewLocationBarRightPadding[mode];
+    case TOOLBAR_VIEW_STANDARD_SPACING:
+      return kToolbarViewStandardSpacing[mode];
+  }
+  NOTREACHED();
+  return 0;
+}
+
+gfx::Insets GetLayoutInsets(LayoutInset inset) {
+  const int kOmniboxDropdownMinIconVerticalPadding[] = {2, 4, 8};
+  const int kOmniboxDropdownMinTextVerticalPadding[] = {3, 4, 8};
+  const int kToolbarButtonBorderInset[] = {2, 6, 6};
+  const int kToolbarViewBottomVerticalPadding[] = {5, 5, 5};
+  const int kToolbarViewTopVerticalPadding[] = {5, 4, 4};
+  const int kToolbarViewLeftEdgeSpacing[] = {3, 4, 8};
+  const int kToolbarViewRightEdgeSpacing[] = {2, 4, 8};
+
+  const int mode = ui::MaterialDesignController::GetMode();
+  switch (inset) {
+    case OMNIBOX_DROPDOWN_ICON: {
+      const int padding = kOmniboxDropdownMinIconVerticalPadding[mode];
+      return gfx::Insets(padding, 0, padding, 0);
+    }
+    case OMNIBOX_DROPDOWN_TEXT: {
+      const int padding = kOmniboxDropdownMinTextVerticalPadding[mode];
+      return gfx::Insets(padding, 0, padding, 0);
+    }
+    case TOOLBAR_BUTTON: {
+      const int inset = kToolbarButtonBorderInset[mode];
+      return gfx::Insets(inset, inset, inset, inset);
+    }
+    case TOOLBAR_VIEW:
+      return gfx::Insets(kToolbarViewTopVerticalPadding[mode],
+                         kToolbarViewLeftEdgeSpacing[mode],
+                         kToolbarViewBottomVerticalPadding[mode],
+                         kToolbarViewRightEdgeSpacing[mode]);
+  }
+  NOTREACHED();
+  return gfx::Insets();
+}