Increase inset for app icons on side launcher.

BUG=297038
R=jamescook@chromium.org

Review URL: https://codereview.chromium.org/24323007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@225037 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 2 deletions

diff --git a/ash/launcher/launcher_button.cc b/ash/launcher/launcher_button.cc
index 38b166f2..0678d15 100644
--- a/ash/launcher/launcher_button.cc
+++ b/ash/launcher/launcher_button.cc
@@ -34,6 +34,7 @@ const int kIconSize = 32;
 const int kHopSpacing = 2;
 const int kIconPad = 8;
 const int kAlternateIconPad = 5;
+const int kAlternateIconPadVertical = 6;
 const int kHopUpMS = 0;
 const int kHopDownMS = 200;
 const int kAttentionThrobDurationMS = 800;
@@ -400,8 +401,12 @@ void LauncherButton::GetAccessibleState(ui::AccessibleViewState* state) {
 
 void LauncherButton::Layout() {
   const gfx::Rect button_bounds(GetContentsBounds());
-  int icon_pad = ash::switches::UseAlternateShelfLayout() ?
-      kAlternateIconPad : kIconPad;
+  int icon_pad = kIconPad;
+  if (ash::switches::UseAlternateShelfLayout()) {
+      icon_pad =
+          shelf_layout_manager_->GetAlignment() != SHELF_ALIGNMENT_BOTTOM ?
+          kAlternateIconPadVertical : kAlternateIconPad;
+  }
   int x_offset = shelf_layout_manager_->PrimaryAxisValue(0, icon_pad);
   int y_offset = shelf_layout_manager_->PrimaryAxisValue(icon_pad, 0);