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

ash/common/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/common/system/tray/system_tray.h"
 
 #include "ash/common/ash_switches.h"
 #include "ash/common/login_status.h"
+#include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/shelf/wm_shelf_util.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/system/cast/tray_cast.h"
 #include "ash/common/system/date/tray_date.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/system/tray/system_tray_item.h"
 #include "ash/common/system/tray/tray_bubble_wrapper.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray_accessibility.h"
 #include "ash/common/system/update/tray_update.h"
 #include "ash/common/system/user/tray_user.h"
 #include "ash/common/system/user/tray_user_separator.h"
+#include "ash/common/system/view_observer.h"
 #include "ash/common/system/web_notification/web_notification_tray.h"
 #include "ash/common/wm_lookup.h"
 #include "ash/common/wm_root_window_controller.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/timer/timer.h"
 #include "grit/ash_strings.h"
@@ skipping 32 matching lines @@
 #include "ui/message_center/message_center.h"
 #endif
 
 using views::TrayBubbleView;
 
 namespace ash {
 
 // The minimum width of the system tray menu width.
 const int kMinimumSystemTrayMenuWidth = 300;
 
+// Padding used to adjust the user-visible size of status tray dark background.
+const int kBackgroundTrayPadding = 3;
+
 // Class to initialize and manage the SystemTrayBubble and TrayBubbleWrapper
 // instances for a bubble.
 
 class SystemBubbleWrapper {
  public:
   // Takes ownership of |bubble|.
   explicit SystemBubbleWrapper(SystemTrayBubble* bubble)
       : bubble_(bubble), is_persistent_(false) {}
 
   // Initializes the bubble view and creates |bubble_wrapper_|.
@@ skipping 29 matching lines @@
  private:
   std::unique_ptr<SystemTrayBubble> bubble_;
   std::unique_ptr<TrayBubbleWrapper> bubble_wrapper_;
   bool is_persistent_;
 
   DISALLOW_COPY_AND_ASSIGN(SystemBubbleWrapper);
 };
 
 // SystemTray
 
-SystemTray::SystemTray(WmShelf* wm_shelf)
-    : TrayBackgroundView(wm_shelf),
+SystemTray::SystemTray(WmShelf* wm_shelf, ViewObserver* view_observer)
+    : TrayBackgroundView(wm_shelf, view_observer),
       web_notification_tray_(nullptr),
       detailed_item_(nullptr),
       default_bubble_height_(0),
       hide_notifications_(false),
       full_system_tray_menu_(false),
       tray_accessibility_(nullptr),
       tray_cast_(nullptr),
       tray_date_(nullptr),
       tray_update_(nullptr),
       screen_capture_tray_item_(nullptr),
@@ skipping 10 matching lines @@
     (*it)->DestroyTrayView();
   }
 }
 
 void SystemTray::InitializeTrayItems(
     SystemTrayDelegate* delegate,
     WebNotificationTray* web_notification_tray) {
   DCHECK(web_notification_tray);
   web_notification_tray_ = web_notification_tray;
   TrayBackgroundView::Initialize();
+  AdjustStatusTrayBackground();
   CreateItems(delegate);
 }
 
 void SystemTray::Shutdown() {
   DCHECK(web_notification_tray_);
   web_notification_tray_ = nullptr;
 }
 
 void SystemTray::CreateItems(SystemTrayDelegate* delegate) {
   WmShell* wm_shell = WmShell::Get();
@@ skipping 435 matching lines @@
   base::HourClockType hour_type =
       WmShell::Get()->system_tray_delegate()->GetHourClockType();
   return base::TimeFormatTimeOfDayWithHourClockType(now, hour_type,
                                                     base::kKeepAmPm);
 }
 
 void SystemTray::SetShelfAlignment(ShelfAlignment alignment) {
   if (alignment == shelf_alignment())
     return;
   TrayBackgroundView::SetShelfAlignment(alignment);
+  if (!ash::MaterialDesignController::IsShelfMaterial()) {
+    AdjustStatusTrayBackground();
+  }
   UpdateAfterShelfAlignmentChange(alignment);
   // Destroy any existing bubble so that it is rebuilt correctly.
   CloseSystemBubbleAndDeactivateSystemTray();
   // Rebuild any notification bubble.
   if (notification_bubble_) {
     notification_bubble_.reset();
     UpdateNotificationBubble();
     // UpdateWebNotifications() should be called in UpdateNotificationBubble().
   } else if (!hide_notifications_) {
     UpdateWebNotifications();
@@ skipping 147 matching lines @@
           ->GetDisplayNearestWindow(bubble_view->GetWidget()->GetNativeView())
           .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);
   }
 }
 
+void SystemTray::AdjustStatusTrayBackground() {
+  if (!ash::MaterialDesignController::IsShelfMaterial()) {
+    tray_container()->SetBorder(
+        views::Border::CreateEmptyBorder(gfx::Insets(kBackgroundTrayPadding)));
+  }
+}
+
 }  // namespace ash