Update shelf spacing in Chrome OS according to the MD specs

ash/system/tray/system_tray.cc

 // Copyright (c) 2012 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/system/tray/system_tray.h"
 
 #include "ash/ash_switches.h"
+#include "ash/material_design/material_design_controller.h"
 #include "ash/metrics/user_metrics_recorder.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_util.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/audio/tray_audio.h"
 #include "ash/system/cast/tray_cast.h"
 #include "ash/system/date/tray_date.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/system/tray/system_tray_delegate.h"
@@ skipping 681 matching lines @@
 views::View* SystemTray::GetTrayItemViewForTest(SystemTrayItem* item) {
   std::map<SystemTrayItem*, views::View*>::iterator it =
       tray_item_map_.find(item);
   return it == tray_item_map_.end() ? NULL : it->second;
 }
 
 TrayCast* SystemTray::GetTrayCastForTesting() const { return tray_cast_; }
 
 TrayDate* SystemTray::GetTrayDateForTesting() const { return tray_date_; }
 
+void SystemTray::GetHitRegionInsets(gfx::Insets& insets) {
+  if (ash::MaterialDesignController::IsShelfMaterial()) {
+    int top_edge, left_edge, bottom_edge, right_edge;
+    if (wm::IsHorizontalAlignment(shelf_alignment())) {
+      top_edge = (GetShelfLayoutConstant(SHELF_SIZE) - kShelfItemHeight) / 2;
+      left_edge = 0;
+      bottom_edge = (GetShelfLayoutConstant(SHELF_SIZE) - kShelfItemHeight) / 2;
+      right_edge = GetTrayConstant(PADDING_FROM_EDGE_OF_SHELF);
+    } else {  // SHELF_ALIGNMENT_LEFT || SHELF_ALIGNMENT_RIGHT
+      top_edge = 0;
+      left_edge = (GetShelfLayoutConstant(SHELF_SIZE) - kShelfItemHeight) / 2;
+      bottom_edge = GetTrayConstant(PADDING_FROM_EDGE_OF_SHELF);
+      right_edge = (GetShelfLayoutConstant(SHELF_SIZE) - kShelfItemHeight) / 2;
+    }
+    insets.Set(top_edge, left_edge, bottom_edge, right_edge);
+  } else {
+    TrayBackgroundView::GetHitRegionInsets(insets);
+  }
+}
+
 bool SystemTray::PerformAction(const ui::Event& event) {
   // If we're already showing the default view, hide it; otherwise, show it
   // (and hide any popup that's currently shown).
   if (HasSystemBubbleType(SystemTrayBubble::BUBBLE_TYPE_DEFAULT)) {
     system_bubble_->bubble()->Close();
   } else {
     int arrow_offset = TrayBubbleView::InitParams::kArrowDefaultOffset;
     if (event.IsMouseEvent() || event.type() == ui::ET_GESTURE_TAP) {
       const ui::LocatedEvent& located_event =
           static_cast<const ui::LocatedEvent&>(event);
@@ skipping 37 matching lines @@
           .work_area()
           .height();
   if (work_area_height > 0) {
     UMA_HISTOGRAM_CUSTOM_COUNTS(
         "Ash.SystemMenu.PercentageOfWorkAreaHeightCoveredByMenu",
         100 * bubble_view->height() / work_area_height, 1, 300, 100);
   }
 }
 
 }  // namespace ash