Give Ash material design tray items the correct size and layout

ash/shelf/overflow_button.cc

 // Copyright 2013 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/overflow_button.h"
 
 #include "ash/common/ash_constants.h"
 #include "ash/common/ash_switches.h"
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/shelf/shelf_constants.h"
-#include "ash/common/system/tray/tray_constants.h"
 #include "ash/shelf/ink_drop_button_listener.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_widget.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
@@ skipping 52 matching lines @@
     ShelfWidget* shelf_widget = shelf_->shelf_widget();
     if (shelf_widget &&
         shelf_widget->GetBackgroundType() ==
             ShelfBackgroundType::SHELF_BACKGROUND_DEFAULT) {
       background_color = SkColorSetA(kShelfBaseColor,
                                      GetShelfConstant(SHELF_BACKGROUND_ALPHA));
     }
 
     // TODO(bruthig|tdanderson): The background should be changed using a
     // fade in/out animation.
-    const int kCornerRadius = 2;
-
     SkPaint background_paint;
     background_paint.setFlags(SkPaint::kAntiAlias_Flag);
     background_paint.setColor(background_color);
-    canvas->DrawRoundRect(bounds, kCornerRadius, background_paint);
+    canvas->DrawRoundRect(bounds, kOverflowButtonCornerRadius,
+                          background_paint);
 
     if (shelf_->IsShowingOverflowBubble()) {
       SkPaint highlight_paint;
       highlight_paint.setFlags(SkPaint::kAntiAlias_Flag);
       highlight_paint.setColor(kShelfButtonActivatedHighlightColor);
-      canvas->DrawRoundRect(bounds, kCornerRadius, highlight_paint);
+      canvas->DrawRoundRect(bounds, kOverflowButtonCornerRadius,
+                            highlight_paint);
     }
   } else {
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     const gfx::ImageSkia* background =
         rb.GetImageNamed(NonMaterialBackgroundImageId()).ToImageSkia();
     canvas->DrawImageInt(*background, bounds.x(), bounds.y());
   }
 }
 
 void OverflowButton::PaintForeground(gfx::Canvas* canvas,
@@ skipping 31 matching lines @@
   else if (shelf_->shelf_widget()->GetDimsShelf())
     return IDR_AURA_NOTIFICATION_BACKGROUND_ON_BLACK;
   return IDR_AURA_NOTIFICATION_BACKGROUND_NORMAL;
 }
 
 gfx::Rect OverflowButton::CalculateButtonBounds() {
   ShelfAlignment alignment = shelf_->alignment();
   gfx::Rect bounds(GetContentsBounds());
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   if (MaterialDesignController::IsShelfMaterial()) {
+    const int width_offset = (bounds.width() - kOverflowButtonSize) / 2;
+    const int height_offset = (bounds.height() - kOverflowButtonSize) / 2;
     if (shelf_->IsHorizontalAlignment()) {
-      bounds = gfx::Rect((bounds.x() + (bounds.width() - kShelfItemSizeMD) / 2),
-                         bounds.y() + (bounds.height() - kShelfItemSizeMD) / 2,
-                         kShelfItemSizeMD, kShelfItemSizeMD);
+      bounds = gfx::Rect(bounds.x() + width_offset, bounds.y() + height_offset,
+                         kOverflowButtonSize, kOverflowButtonSize);
     } else {
-      bounds =
-          gfx::Rect(bounds.x() + ((bounds.height() - kShelfItemSizeMD) / 2),
-                    bounds.y() + (bounds.width() - kShelfItemSizeMD) / 2,
-                    kShelfItemSizeMD, kShelfItemSizeMD);
+      bounds = gfx::Rect(bounds.x() + height_offset, bounds.y() + width_offset,
+                         kOverflowButtonSize, kOverflowButtonSize);
     }
   } else {
     const gfx::ImageSkia* background =
         rb.GetImageNamed(NonMaterialBackgroundImageId()).ToImageSkia();
     if (alignment == SHELF_ALIGNMENT_LEFT) {
       bounds =
           gfx::Rect(bounds.right() - background->width() - kShelfItemInset,
                     bounds.y() + (bounds.height() - background->height()) / 2,
                     background->width(), background->height());
     } else if (alignment == SHELF_ALIGNMENT_RIGHT) {
       bounds =
           gfx::Rect(bounds.x() + kShelfItemInset,
                     bounds.y() + (bounds.height() - background->height()) / 2,
                     background->width(), background->height());
     } else {
       bounds =
           gfx::Rect(bounds.x() + (bounds.width() - background->width()) / 2,
                     bounds.y() + kShelfItemInset, background->width(),
                     background->height());
     }
   }
   return bounds;
 }
 
 }  // namespace ash