Give Ash material design tray items the correct size and layout

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/common/ash_constants.h"
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/shelf/shelf_constants.h"
 #include "ash/common/shelf/shelf_item_types.h"
 #include "ash/common/shelf/shelf_types.h"
 #include "ash/common/shelf/wm_shelf_util.h"
+#include "ash/common/system/tray/tray_constants.h"
 #include "ash/shelf/ink_drop_button_listener.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 "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/gfx/paint_vector_icon.h"
 #include "ui/gfx/vector_icons_public.h"
 #include "ui/views/painter.h"
 
 namespace ash {
 
-// Radius of the app list button circular background.
-const int kAppListButtonBackgroundRadius = 16;
-
 AppListButton::AppListButton(InkDropButtonListener* listener,
                              ShelfView* shelf_view)
     : views::ImageButton(nullptr),
       draw_background_as_active_(false),
       listener_(listener),
       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));
@@ skipping 90 matching lines @@
 
   const ShelfWidget* shelf_widget = shelf_view_->shelf()->shelf_widget();
   if (shelf_widget &&
       shelf_widget->GetBackgroundType() ==
           ShelfBackgroundType::SHELF_BACKGROUND_DEFAULT) {
     background_paint.setColor(
         SkColorSetA(kShelfBaseColor, GetShelfConstant(SHELF_BACKGROUND_ALPHA)));
   }
 
   // Paint the circular background of AppList button.
+  const int kRadius = kTrayItemSize / 2;

[James Cook, 2016/06/27 18:04:12]

nit: elsewhere you use the style "const int radius =". Either is fine, but be
consistent.

[tdanderson, 2016/06/27 21:29:42]

Done.

   gfx::Point circle_center = GetContentsBounds().CenterPoint();
   if (!IsHorizontalAlignment(shelf_view_->shelf()->alignment()))
     circle_center = gfx::Point(circle_center.y(), circle_center.x());
-
-  canvas->DrawCircle(circle_center, kAppListButtonBackgroundRadius,
-                     background_paint);
+  canvas->DrawCircle(circle_center, kRadius, background_paint);
 
   if (Shell::GetInstance()->GetAppListTargetVisibility() ||
       draw_background_as_active_) {
     SkPaint highlight_paint;
     highlight_paint.setColor(kShelfButtonActivatedHighlightColor);
     highlight_paint.setFlags(SkPaint::kAntiAlias_Flag);
     highlight_paint.setStyle(SkPaint::kFill_Style);
-
-    canvas->DrawCircle(circle_center, kAppListButtonBackgroundRadius,
-                       highlight_paint);
+    canvas->DrawCircle(circle_center, kRadius, highlight_paint);
   }
 }
 
 void AppListButton::PaintForegroundMD(gfx::Canvas* canvas,
                                       const gfx::ImageSkia& foreground_image) {
   gfx::Rect foreground_bounds(foreground_image.size());
   gfx::Rect contents_bounds = GetContentsBounds();
 
   if (IsHorizontalAlignment(shelf_view_->shelf()->alignment())) {
     foreground_bounds.set_x(
@@ skipping 76 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