Update shelf spacing in Chrome OS according to the MD specs

ash/shelf/app_list_button.cc

 // Copyright 2014 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/shelf/app_list_button.h"
 
 #include "ash/ash_constants.h"
+#include "ash/material_design/material_design_controller.h"
 #include "ash/shelf/shelf_item_types.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_view.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
+#include "ash/wm/common/shelf/wm_shelf_util.h"
 #include "base/command_line.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/app_list/app_list_switches.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_switches_util.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/painter.h"
 
 namespace ash {
 
 AppListButton::AppListButton(ShelfView* shelf_view)
     : views::ImageButton(shelf_view),
       draw_background_as_active_(false),
       shelf_view_(shelf_view) {
   SetAccessibleName(
       app_list::switches::IsExperimentalAppListEnabled()
           ? l10n_util::GetStringUTF16(IDS_ASH_SHELF_APP_LIST_LAUNCHER_TITLE)
           : l10n_util::GetStringUTF16(IDS_ASH_SHELF_APP_LIST_TITLE));
-  SetSize(gfx::Size(kShelfSize, kShelfSize));
+  SetSize(gfx::Size(GetShelfLayoutConstant(SHELF_SIZE),
+                    GetShelfLayoutConstant(SHELF_SIZE)));
   SetFocusPainter(views::Painter::CreateSolidFocusPainter(
                       kFocusBorderColor, gfx::Insets(1, 1, 1, 1)));
   set_notify_action(CustomButton::NOTIFY_ON_PRESS);
 }
 
 AppListButton::~AppListButton() {}
 
 bool AppListButton::OnMousePressed(const ui::MouseEvent& event) {
   ImageButton::OnMousePressed(event);
   shelf_view_->PointerPressedOnButton(this, ShelfView::MOUSE, event);
@@ skipping 73 matching lines @@
                                 ? IDR_ASH_SHELF_ICON_APPLIST
                                 : IDR_ASH_SHELF_ICON_APPLIST_CLASSIC;
   const gfx::ImageSkia* forground_image =
       rb.GetImageNamed(foreground_image_id).ToImageSkia();
 
   gfx::Rect contents_bounds = GetContentsBounds();
   gfx::Rect background_bounds, forground_bounds;
 
   wm::ShelfAlignment alignment = shelf_view_->shelf()->alignment();
   background_bounds.set_size(background_image->size());
-  if (alignment == wm::SHELF_ALIGNMENT_LEFT) {
-    background_bounds.set_x(contents_bounds.width() -
-        ShelfLayoutManager::kShelfItemInset - background_image->width());
-    background_bounds.set_y(contents_bounds.y() +
-        (contents_bounds.height() - background_image->height()) / 2);
-  } else if (alignment == wm::SHELF_ALIGNMENT_RIGHT) {
-    background_bounds.set_x(ShelfLayoutManager::kShelfItemInset);
-    background_bounds.set_y(contents_bounds.y() +
-        (contents_bounds.height() - background_image->height()) / 2);
+
+  if (MaterialDesignController::IsShelfMaterial()) {
+    // SHELF_ALIGHTMENT_RIGHT AND SHELF_ALIGHMENT_LEFT

[tdanderson, 2016/06/03 19:25:23]

nit: comment not needed

[yiyix, 2016/06/10 19:26:04]

Done.

+    if (!wm::IsHorizontalAlignment(alignment)) {

[tdanderson, 2016/06/03 19:25:23]

super nit: swap if/else to structure this as:

if (wm::IsHorizontalAlignment(alignment)) {
  ...
} else {
  ...
}

[yiyix, 2016/06/10 19:26:04]

Done.

+      background_bounds.set_x(
+          (contents_bounds.width() - background_image->width()) / 2);
+      background_bounds.set_y(
+          contents_bounds.y() +
+          (contents_bounds.height() - background_image->height()) / 2);
+    } else {  // SHELF_ALIGNMENT_BOTTOM

[tdanderson, 2016/06/03 19:25:23]

nit: remove comment

[yiyix, 2016/06/10 19:26:04]

Done.

+      background_bounds.set_y(
+          (contents_bounds.height() - background_image->height()) / 2);
+      background_bounds.set_x(
+          contents_bounds.x() +
+          (contents_bounds.width() - background_image->width()) / 2);
+    }
   } else {
-    background_bounds.set_y(ShelfLayoutManager::kShelfItemInset);
-    background_bounds.set_x(contents_bounds.x() +
-        (contents_bounds.width() - background_image->width()) / 2);
+    if (alignment == wm::SHELF_ALIGNMENT_LEFT) {
+      background_bounds.set_x(contents_bounds.width() - kShelfItemInset -
+                              background_image->width());
+      background_bounds.set_y(
+          contents_bounds.y() +
+          (contents_bounds.height() - background_image->height()) / 2);
+    } else if (alignment == wm::SHELF_ALIGNMENT_RIGHT) {
+      background_bounds.set_x(kShelfItemInset);
+      background_bounds.set_y(
+          contents_bounds.y() +
+          (contents_bounds.height() - background_image->height()) / 2);
+    } else {  // SHELF_ALIGNMENT_BOTTOM
+      background_bounds.set_y(kShelfItemInset);
+      background_bounds.set_x(
+          contents_bounds.x() +
+          (contents_bounds.width() - background_image->width()) / 2);
+    }
   }
 
   forground_bounds.set_size(forground_image->size());
   forground_bounds.set_x(background_bounds.x() +
       std::max(0,
           (background_bounds.width() - forground_bounds.width()) / 2));
   forground_bounds.set_y(background_bounds.y() +
       std::max(0,
           (background_bounds.height() - forground_bounds.height()) / 2));
 
@@ skipping 14 matching lines @@
 
 void AppListButton::SetDrawBackgroundAsActive(
     bool draw_background_as_active) {
   if (draw_background_as_active_ == draw_background_as_active)
     return;
   draw_background_as_active_ = draw_background_as_active;
   SchedulePaint();
 }
 
 }  // namespace ash