Ash: Use new toolbar buttons, adjust spacing

chrome/browser/ui/views/toolbar_view.cc

 // Copyright (c) 2012 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_view.h"
 
 #include "base/i18n/number_formatting.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/prefs/pref_service.h"
@@ skipping 37 matching lines @@
 #include "chrome/browser/ui/views/app_menu_button_win.h"
 #endif
 #endif
 
 using content::UserMetricsAction;
 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).
 static const int kPulseDuration = 2000;
 
 // How long to wait between pulsating the upgrade notifier.
 static const int kPulsateEveryMs = 8000;
 
 static const int kPopupTopSpacingNonGlass = 3;
 static const int kPopupBottomSpacingNonGlass = 2;
@@ skipping 653 matching lines @@
     accname_app = l10n_util::GetStringFUTF16(
         IDS_ACCNAME_APP_UPGRADE_RECOMMENDED, accname_app);
   }
   app_menu_->SetAccessibleName(accname_app);
 
   app_menu_->SetIcon(GetAppMenuIcon(views::CustomButton::BS_NORMAL));
   app_menu_->SetHoverIcon(GetAppMenuIcon(views::CustomButton::BS_HOT));
   app_menu_->SetPushedIcon(GetAppMenuIcon(views::CustomButton::BS_PUSHED));
   SchedulePaint();
 }