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

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

 // Copyright 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 "chrome/browser/ui/views/toolbar/wrench_toolbar_button.h"
 
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/time/time.h"
-#include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/views/extensions/browser_action_drag_data.h"
+#include "chrome/browser/ui/views/layout_constants.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
 #include "extensions/common/feature_switch.h"
 #include "grit/theme_resources.h"
 #include "ui/base/resource/material_design/material_design_controller.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/theme_provider.h"
 #include "ui/views/controls/button/label_button_border.h"
 #include "ui/views/metrics.h"
 #include "ui/views/painter.h"
 
@@ skipping 22 matching lines @@
 
   wrench_icon_painter_->SetSeverity(severity, animate);
   SchedulePaint();
 }
 
 gfx::Size WrenchToolbarButton::GetPreferredSize() const {
   if (ui::MaterialDesignController::IsModeMaterial()) {
     gfx::Size size(image()->GetPreferredSize());
     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;
   }
 
   return ResourceBundle::GetSharedInstance().
       GetImageSkiaNamed(IDR_TOOLBAR_BEZEL_HOVER)->size();
 }
 
 void WrenchToolbarButton::ScheduleWrenchIconPaint() {
   SchedulePaint();
@@ skipping 55 matching lines @@
     return;
   wrench_icon_painter_->Paint(canvas,
                               GetThemeProvider(),
                               gfx::Rect(size()),
                               WrenchIconPainter::BEZEL_NONE);
 }
 
 void WrenchToolbarButton::ShowOverflowMenu() {
   toolbar_view_->ShowAppMenu(true);  // For drop.
 }