Last round of cleaning up MD 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 00e427c500ba6dfb5d3778db8621be4d9013d3e2..4b5f4f9f9d5209191c567711c0785512a3570310 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_button.cc
+++ b/chrome/browser/ui/views/toolbar/toolbar_button.cc
@@ -12,7 +12,6 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
-#include "chrome/browser/ui/layout_constants.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -58,15 +57,16 @@ bool ToolbarButton::IsMenuShowing() const {
 
 gfx::Size ToolbarButton::GetPreferredSize() const {
   gfx::Size size(image()->GetPreferredSize());
+  // TODO(estade): do we ever actually set text on a ToolbarButton?

[Peter Kasting, 2016/12/08 20:57:50]

Maybe for extensions?

[Evan Stade, 2016/12/13 01:31:19]

I don't see how extensions could reach this because ToolbarButton has only three
overrides: Back, Home and Reload, plus a direct instantiation for Forward.

   gfx::Size label_size = label()->GetPreferredSize();
+  CHECK_EQ(0, label_size.width());

[Peter Kasting, 2016/12/08 20:57:50]

I'd kinda rather add something like this in a separate CL, just so you don't get
this whole one auto-reverted if this breaks something.

(Might be clearer to do as a CHECK(FALSE) inside the next conditional as well.)

[Evan Stade, 2016/12/13 01:31:19]

oops --- this was just meant to be debug code I sent by the trybots to make sure
they were OK with removing this code. Between the trybots OK'ing this and my own
inability to find where something sets a label, I think we can simplify this
code.

   if (label_size.width() > 0) {
-    size.Enlarge(
-        label_size.width() + GetLayoutConstant(LOCATION_BAR_HORIZONTAL_PADDING),
-        0);
+    size.Enlarge(label_size.width() /* + LocationBarView::kHorizontalPadding*/,

[Peter Kasting, 2016/12/08 20:57:50]

Commenting this out seems wrong?

[Evan Stade, 2016/12/13 01:31:19]

yea, removed.

+                 0);
   }
-  const int pad = GetLayoutConstant(TOOLBAR_BUTTON_PADDING);
-  size.Enlarge(2 * pad, 2 * pad);
-  return size;
+  gfx::Rect rect(size);
+  rect.Inset(gfx::Insets(-kInteriorPadding));
+  return rect.size();
 }
 
 bool ToolbarButton::OnMousePressed(const ui::MouseEvent& event) {
@@ -150,7 +150,7 @@ std::unique_ptr<views::LabelButtonBorder> ToolbarButton::CreateDefaultBorder()
       views::LabelButton::CreateDefaultBorder();
 
   if (ThemeServiceFactory::GetForProfile(profile_)->UsingSystemTheme())
-    border->set_insets(gfx::Insets(GetLayoutConstant(TOOLBAR_BUTTON_PADDING)));
+    border->set_insets(gfx::Insets(kInteriorPadding));
 
   return border;
 }