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

chrome/browser/ui/views/toolbar/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/toolbar_button.h"
 
 #include "base/bind.h"
 #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"
 #include "ui/base/models/menu_model.h"
 #include "ui/base/resource/material_design/material_design_controller.h"
 #include "ui/base/theme_provider.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/screen.h"
 #include "ui/strings/grit/ui_strings.h"
 #include "ui/views/animation/ink_drop_animation_controller.h"
@@ skipping 30 matching lines @@
 }
 
 bool ToolbarButton::IsMenuShowing() const {
   return menu_showing_;
 }
 
 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
   // from the image assets. Enlarge the button by the theme provided insets.
   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;
 }
 
 void ToolbarButton::Layout() {
   LabelButton::Layout();
   LayoutInkDrop();
 }
 
@@ skipping 99 matching lines @@
   state->AddStateFlag(ui::AX_STATE_HASPOPUP);
 }
 
 scoped_ptr<views::LabelButtonBorder>
 ToolbarButton::CreateDefaultBorder() const {
   scoped_ptr<views::LabelButtonBorder> border =
       views::LabelButton::CreateDefaultBorder();
 
   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();
 }
 
 void ToolbarButton::ShowContextMenuForView(View* source,
                                            const gfx::Point& point,
                                            ui::MenuSourceType source_type) {
   if (!enabled())
     return;
@@ skipping 117 matching lines @@
     SetState(STATE_NORMAL);
 }
 
 void ToolbarButton::LayoutInkDrop() {
   ink_drop_animation_controller_->SetInkDropSize(size());
 }
 
 const char* ToolbarButton::GetClassName() const {
   return "ToolbarButton";
 }