tweak icon spacing for launcher

ash/launcher/launcher_button.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 "ash/launcher/launcher_button.h"
 
 #include <algorithm>
 
 #include "ash/launcher/launcher_button_host.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/compositor/layer.h"
 #include "ui/gfx/compositor/scoped_layer_animation_settings.h"
 #include "ui/views/controls/image_view.h"
 
 namespace {
 const int kBarHeight = 4;
-const int kBarSpacing = 10;
+const int kBarSpacing = 6;
 const int kIconHeight = 32;
 const int kIconWidth = 48;
 const int kHopSpacing = 2;
 const int kActiveBarColor = 0xe6ffffff;
 const int kInactiveBarColor = 0x80ffffff;
 const int kHopUpMS = 130;
 const int kHopDownMS = 260;
 
 // Used to allow Mouse...() messages to go to the parent view.
 class MouseIgnoredView : public views::View {
@@ skipping 146 matching lines @@
   host_->MouseExitedButton(this);
 }
 
 void LauncherButton::GetAccessibleState(ui::AccessibleViewState* state) {
   state->role = ui::AccessibilityTypes::ROLE_PUSHBUTTON;
   state->name = host_->GetAccessibleName(this);
 }
 
 void LauncherButton::Layout() {
   int image_x = (width() - icon_view_->width()) / 2;
-  int image_y = ShouldHop(state_) ? 0 : kHopSpacing;
+  int image_y = height() - (icon_view_->height() + kBarHeight + kBarSpacing);
+
+  if (ShouldHop(state_))
+    image_y -= kHopSpacing;
+
   icon_view_->SetPosition(gfx::Point(image_x, image_y));
   bar_->SetBounds(0, height() - kBarHeight, width(), kBarHeight);
 }
 
 bool LauncherButton::GetTooltipText(
     const gfx::Point& p, string16* tooltip) const {
   DCHECK(tooltip);
   tooltip->assign(host_->GetAccessibleName(this));
   return true;
 }
@@ skipping 27 matching lines @@
       bar_->set_background(views::Background::CreateSolidBackground(
           kInactiveBarColor));
     }
   }
 
   Layout();
   SchedulePaint();
 }
 }  // namespace internal
 }  // namespace ash