[Chrome OS MD] Draw a 1px separator between 2 tray items

ash/common/system/overview/overview_button_tray.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/common/system/overview/overview_button_tray.h"
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shelf/shelf_constants.h"
 #include "ash/common/shelf/shelf_types.h"
+#include "ash/common/shelf/wm_shelf_observer.h"
 #include "ash/common/shelf/wm_shelf_util.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_utils.h"
 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
 #include "ash/common/wm/overview/window_selector_controller.h"
 #include "ash/common/wm_shell.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/gfx/vector_icons_public.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/image_view.h"
 
 namespace {
 
 // Predefined padding for the icon used in this tray. These are to be set to the
 // border of the icon, depending on the current shelf_alignment()
 const int kHorizontalShelfHorizontalPadding = 8;
 const int kHorizontalShelfVerticalPadding = 4;
 const int kVerticalShelfHorizontalPadding = 2;
 const int kVerticalShelfVerticalPadding = 5;
 
+// Padding used to adjust the user-visible size of overview tray's dark
+// background.
+const int kBackgroundTrayPadding = 3;
+
 }  // namespace
 
 namespace ash {
 
-OverviewButtonTray::OverviewButtonTray(WmShelf* wm_shelf)
-    : TrayBackgroundView(wm_shelf), icon_(nullptr) {
+OverviewButtonTray::OverviewButtonTray(WmShelf* wm_shelf,
+                                       WmShelfObserver* wm_shelf_observer)
+    : TrayBackgroundView(wm_shelf, wm_shelf_observer), icon_(nullptr) {
   SetContentsBackground();
+  SetOverviewTrayBorder();
 
   icon_ = new views::ImageView();
   if (MaterialDesignController::IsShelfMaterial()) {
     gfx::ImageSkia image_md =
         CreateVectorIcon(gfx::VectorIconId::SHELF_OVERVIEW, kShelfIconColor);
     icon_->SetImage(image_md);
   } else {
     gfx::ImageSkia* image_non_md =
         ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
             IDR_AURA_UBER_TRAY_OVERVIEW_MODE);
@@ skipping 50 matching lines @@
 void OverviewButtonTray::HideBubbleWithView(
     const views::TrayBubbleView* bubble_view) {
   // This class has no bubbles to hide.
 }
 
 void OverviewButtonTray::SetShelfAlignment(ShelfAlignment alignment) {
   if (alignment == shelf_alignment())
     return;
 
   TrayBackgroundView::SetShelfAlignment(alignment);
-  SetIconBorderForShelfAlignment();
+  if (!ash::MaterialDesignController::IsShelfMaterial()) {
+    SetOverviewTrayBorder();
+    SetIconBorderForShelfAlignment();
+  }
 }
 
 void OverviewButtonTray::SetIconBorderForShelfAlignment() {
   if (ash::MaterialDesignController::IsShelfMaterial()) {
     // Pad button size to align with other controls in the system tray.
     const gfx::ImageSkia image = icon_->GetImage();
     const int vertical_padding = (kTrayItemSize - image.height()) / 2;
     const int horizontal_padding = (kTrayItemSize - image.width()) / 2;
     icon_->SetBorder(views::Border::CreateEmptyBorder(
         gfx::Insets(vertical_padding, horizontal_padding)));
   } else {
     if (IsHorizontalAlignment(shelf_alignment())) {
-      icon_->SetBorder(views::Border::CreateEmptyBorder(
-          kHorizontalShelfVerticalPadding, kHorizontalShelfHorizontalPadding,
-          kHorizontalShelfVerticalPadding, kHorizontalShelfHorizontalPadding));
+      icon_->SetBorder(views::Border::CreateEmptyBorder(gfx::Insets(
+          kHorizontalShelfVerticalPadding, kHorizontalShelfHorizontalPadding)));
     } else {
-      icon_->SetBorder(views::Border::CreateEmptyBorder(
-          kVerticalShelfVerticalPadding, kVerticalShelfHorizontalPadding,
-          kVerticalShelfVerticalPadding, kVerticalShelfHorizontalPadding));
+      icon_->SetBorder(views::Border::CreateEmptyBorder(gfx::Insets(
+          kVerticalShelfVerticalPadding, kVerticalShelfHorizontalPadding)));
     }
   }
 }
 
+void OverviewButtonTray::SetOverviewTrayBorder() {
+  if (!ash::MaterialDesignController::IsShelfMaterial()) {
+    tray_container()->SetBorder(
+        views::Border::CreateEmptyBorder(gfx::Insets(kBackgroundTrayPadding)));
+  }
+}
+
 void OverviewButtonTray::UpdateIconVisibility() {
   // The visibility of the OverviewButtonTray has diverge from
   // WindowSelectorController::CanSelect. The visibility of the button should
   // not change during transient times in which CanSelect is false. Such as when
   // a modal dialog is present.
   WmShell* shell = WmShell::Get();
   SessionStateDelegate* session_state_delegate =
       shell->GetSessionStateDelegate();
-
   SetVisible(
       shell->maximize_mode_controller()->IsMaximizeModeWindowManagerEnabled() &&
       session_state_delegate->IsActiveUserSessionStarted() &&
       !session_state_delegate->IsScreenLocked() &&
       session_state_delegate->GetSessionState() ==
           SessionStateDelegate::SESSION_STATE_ACTIVE &&
       shell->system_tray_delegate()->GetUserLoginStatus() !=
           LoginStatus::KIOSK_APP);
 }
 
 }  // namespace ash