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

chrome/browser/ui/views/toolbar/toolbar_button.cc

Index: chrome/browser/ui/views/toolbar/toolbar_button.cc
diff --git a/chrome/browser/ui/views/toolbar/toolbar_button.cc b/chrome/browser/ui/views/toolbar/toolbar_button.cc
index 835ccf2aa79112641295f60337ad902f7a8b45f1..06b248a3a3f0206ece46ed356e3be376ce1a24eb 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_button.cc
+++ b/chrome/browser/ui/views/toolbar/toolbar_button.cc
@@ -8,7 +8,7 @@
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
-#include "chrome/browser/themes/theme_properties.h"
+#include "chrome/browser/ui/views/layout_constants.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -59,9 +59,9 @@ gfx::Size ToolbarButton::GetPreferredSize() const {
   gfx::Size size(image()->GetPreferredSize());
   gfx::Size label_size = label()->GetPreferredSize();
   if (label_size.width() > 0) {
-    const int horizontal_item_padding = GetThemeProvider()->GetDisplayProperty(
-        ThemeProperties::PROPERTY_LOCATION_BAR_HORIZONTAL_PADDING);
-    size.Enlarge(label_size.width() + horizontal_item_padding, 0);
+    size.Enlarge(
+        label_size.width() + GetLayoutConstant(LOCATION_BAR_HORIZONTAL_PADDING),
+        0);
   }
   // For non-material assets the entire size of the button is captured in the
   // image resource. For Material Design the excess whitespace is being removed
@@ -69,9 +69,8 @@ gfx::Size ToolbarButton::GetPreferredSize() const {
   if (ui::MaterialDesignController::IsModeMaterial()) {
     ui::ThemeProvider* provider = GetThemeProvider();
     if (provider && provider->UsingSystemTheme()) {
-      int inset = provider->GetDisplayProperty(
-          ThemeProperties::PROPERTY_TOOLBAR_BUTTON_BORDER_INSET);
-      size.Enlarge(2 * inset, 2 * inset);
+      gfx::Insets insets(GetLayoutInsets(TOOLBAR_BUTTON));
+      size.Enlarge(insets.width(), insets.height());
     }
   }
   return size;
@@ -191,10 +190,8 @@ ToolbarButton::CreateDefaultBorder() const {
 
   ui::ThemeProvider* provider = GetThemeProvider();
   if (provider && provider->UsingSystemTheme()) {
-    // Theme provided insets.
-    int inset = provider->GetDisplayProperty(
-        ThemeProperties::PROPERTY_TOOLBAR_BUTTON_BORDER_INSET);
-    border->set_insets(gfx::Insets(inset, inset, inset, inset));
+    gfx::Insets insets(GetLayoutInsets(TOOLBAR_BUTTON));
+    border->set_insets(insets);

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

Nit: border->set_insets(GetLayoutInsets(TOOLBAR_BUTTON));

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

Done.

   }
 
   return border.Pass();