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_switches.h"
+#include "ash/material_design/material_design_controller.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 68 matching lines @@
   if (shelf_->IsShowingOverflowBubble())
     background_image_id = IDR_AURA_NOTIFICATION_BACKGROUND_PRESSED;
   else if (shelf_->shelf_widget()->GetDimsShelf())
     background_image_id = IDR_AURA_NOTIFICATION_BACKGROUND_ON_BLACK;
   else
     background_image_id = IDR_AURA_NOTIFICATION_BACKGROUND_NORMAL;
 
   const gfx::ImageSkia* background =
       rb.GetImageNamed(background_image_id).ToImageSkia();
   wm::ShelfAlignment alignment = shelf_->alignment();
-  if (alignment == wm::SHELF_ALIGNMENT_LEFT) {
-    bounds = gfx::Rect(
-        bounds.right() - background->width() -
-            ShelfLayoutManager::kShelfItemInset,
-        bounds.y() + (bounds.height() - background->height()) / 2,
-        background->width(), background->height());
-  } else if (alignment == wm::SHELF_ALIGNMENT_RIGHT) {
-    bounds = gfx::Rect(
-        bounds.x() + ShelfLayoutManager::kShelfItemInset,
-        bounds.y() + (bounds.height() - background->height()) / 2,
-        background->width(), background->height());
+
+  // If Material Design for Chrome OS shelf is enabled.

[tdanderson, 2016/05/26 22:55:56]

nit: remove comment. (similarly in app_list_button.cc)

[yiyix, 2016/06/02 03:54:53]

Done.

+  if (MaterialDesignController::IsShelfMaterial()) {
+    if (alignment == wm::SHELF_ALIGNMENT_LEFT ||
+        alignment == wm::SHELF_ALIGNMENT_RIGHT) {

[tdanderson, 2016/05/26 22:55:56]

nit: can you instead use !wm::IsHorizontalAlignment(alignment) ? (similarly in
app_list_button.cc)

+      bounds =
+          gfx::Rect(bounds.x() + ((bounds.width() - background->width()) / 2),
+                    bounds.y() + ShelfLayoutManager::GetShelfItemInset(
+                                     ShelfLayoutManager::SHELF_ITEM_INSET) +
+                        (bounds.height() - background->height()) / 2,
+                    background->width(), background->height());
+    } else {  // SHELF_ALIGNMENT_BOTTOM
+      bounds =
+          gfx::Rect((bounds.x() + ShelfLayoutManager::GetShelfItemInset(
+                                      ShelfLayoutManager::SHELF_ITEM_INSET) +
+                     (bounds.width() - background->width()) / 2),
+                    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());
+    if (alignment == wm::SHELF_ALIGNMENT_LEFT) {
+      bounds =
+          gfx::Rect(bounds.right() - background->width() -
+                        ShelfLayoutManager::GetShelfItemInset(
+                            ShelfLayoutManager::SHELF_ITEM_INSET),
+                    bounds.y() + (bounds.height() - background->height()) / 2,
+                    background->width(), background->height());
+    } else if (alignment == wm::SHELF_ALIGNMENT_RIGHT) {
+      bounds =
+          gfx::Rect(bounds.x() + ShelfLayoutManager::GetShelfItemInset(
+                                     ShelfLayoutManager::SHELF_ITEM_INSET),
+                    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::GetShelfItemInset(
+                                     ShelfLayoutManager::SHELF_ITEM_INSET),
+                    background->width(), background->height());
+    }
   }
   canvas->DrawImageInt(*background, bounds.x(), bounds.y());
 
   if (height() < kButtonHoverSize)
     return;
 
   const gfx::ImageSkia* image = NULL;
 
   switch(alignment) {
     case wm::SHELF_ALIGNMENT_LEFT:
@@ skipping 14 matching lines @@
       image = bottom_image_;
       break;
   }
 
   canvas->DrawImageInt(*image,
                        bounds.x() + ((bounds.width() - image->width()) / 2),
                        bounds.y() + ((bounds.height() - image->height()) / 2));
 }
 
 }  // namespace ash