Update shelf spacing in Chrome OS according to the MD specs

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/ash_constants.h"
 #include "ash/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/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"
 #include "ui/gfx/animation/throb_animation.h"
@@ skipping 99 matching lines @@
   if (shelf_->IsShowingOverflowBubble())
     return IDR_AURA_NOTIFICATION_BACKGROUND_PRESSED;
   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());
-  if (!MaterialDesignController::IsShelfMaterial()) {
-    ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+  if (MaterialDesignController::IsShelfMaterial()) {
+    if (shelf_->IsHorizontalAlignment()) {
+      bounds = gfx::Rect((bounds.x() + (bounds.width() - kShelfItemSizeMD) / 2),
+                         bounds.y() + (bounds.height() - kShelfItemSizeMD) / 2,
+                         kShelfItemSizeMD, kShelfItemSizeMD);
+    } else {
+      bounds =
+          gfx::Rect(bounds.x() + ((bounds.height() - kShelfItemSizeMD) / 2),
+                    bounds.y() + (bounds.width() - kShelfItemSizeMD) / 2,
+                    kShelfItemSizeMD, kShelfItemSizeMD);
+    }
+  } else {
     const gfx::ImageSkia* background =
         rb.GetImageNamed(NonMaterialBackgroundImageId()).ToImageSkia();
     if (alignment == SHELF_ALIGNMENT_LEFT) {
-      bounds = gfx::Rect(
-          bounds.right() - background->width() -
-              ShelfLayoutManager::kShelfItemInset,
-          bounds.y() + (bounds.height() - background->height()) / 2,
-          background->width(), background->height());
+      bounds =
+          gfx::Rect(bounds.right() - background->width() - kShelfItemSizeMD,

[tdanderson, 2016/06/10 22:54:43]

Is this a typo (lines 148, 153, and 159)? You're including an MD constant in
non-MD code.

[yiyix, 2016/06/13 18:43:54]

It is a typo. Sorry.

+                    bounds.y() + (bounds.height() - background->height()) / 2,
+                    background->width(), background->height());
     } else if (alignment == SHELF_ALIGNMENT_RIGHT) {
-      bounds = gfx::Rect(
-          bounds.x() + ShelfLayoutManager::kShelfItemInset,
-          bounds.y() + (bounds.height() - background->height()) / 2,
-          background->width(), background->height());
+      bounds =
+          gfx::Rect(bounds.x() + kShelfItemSizeMD,
+                    bounds.y() + (bounds.height() - background->height()) / 2,
+                    background->width(), background->height());
     } else {
-      bounds = gfx::Rect(
-          bounds.x() + (bounds.width() - background->width()) / 2,
-          bounds.y() + ShelfLayoutManager::kShelfItemInset,
-          background->width(), background->height());
+      bounds =
+          gfx::Rect(bounds.x() + (bounds.width() - background->width()) / 2,
+                    bounds.y() + kShelfItemSizeMD, background->width(),
+                    background->height());
     }
   }
-
   return bounds;
 }
 
 }  // namespace ash