Ash: Use new toolbar buttons, adjust spacing

chrome/browser/ui/views/toolbar_view.cc

Index: chrome/browser/ui/views/toolbar_view.cc
diff --git a/chrome/browser/ui/views/toolbar_view.cc b/chrome/browser/ui/views/toolbar_view.cc
index 86d386d2859685da5ed4ba0a6a37760fdbcdde97..442d05b586efade2fcc2c39926c4495597a1ce7a 100644
--- a/chrome/browser/ui/views/toolbar_view.cc
+++ b/chrome/browser/ui/views/toolbar_view.cc
@@ -55,17 +55,31 @@ using content::WebContents;
 // static
 const char ToolbarView::kViewClassName[] = "browser/ui/views/ToolbarView";
 // The space between items is 4 px in general.
+// TODO(jamescook): Update all Chrome platforms to use the new art and metrics
+// from Ash, crbug.com/118228
+#if defined(USE_ASH)
+const int ToolbarView::kStandardSpacing = 3;
+#else
 const int ToolbarView::kStandardSpacing = 4;
+#endif
+
 // The top of the toolbar has an edge we have to skip over in addition to the 4
 // px of spacing.
-const int ToolbarView::kVertSpacing = kStandardSpacing + 1;
+const int ToolbarView::kVertSpacing = 5;
 // The edge graphics have some built-in spacing/shadowing, so we have to adjust
 // our spacing to make it still appear to be 4 px.
-static const int kEdgeSpacing = ToolbarView::kStandardSpacing - 1;
+#if defined(USE_ASH)
+static const int kEdgeSpacing = 4;
+#else
+static const int kEdgeSpacing = 3;
+#endif
+
 // The buttons to the left of the omnibox are close together.
+#if defined(USE_ASH)
+static const int kButtonSpacing = 0;
+#else
 static const int kButtonSpacing = 1;
-
-static const int kStatusBubbleWidth = 480;
+#endif
 
 // The length of time to run the upgrade notification animation (the time it
 // takes one pulse to run its course and go back to its original brightness).