[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"
@@ skipping 46 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;

[varkha, 2016/07/14 21:34:47]

Should this live in a common place?

[yiyix, 2016/07/26 20:27:31]

I was thinking that the overview button padding could be different from the
status tray padding. They should be independent. So I choose to list these 2
constant in the status_tray.cc and overview_button_tray.cc file separately.

+
 // 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 61 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 434 matching lines @@
     const base::Time& now) const {
   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;
+

[varkha, 2016/07/14 21:34:47]

nit: no ws.

   TrayBackgroundView::SetShelfAlignment(alignment);
+  AdjustStatusTrayBackground();

[varkha, 2016/07/14 21:34:47]

Same questions / comments as in overview_button_tray. Do you need to call this
every time alignment changes in MD given the padding is same on all sides?

[yiyix, 2016/07/26 20:27:31]

Done.

   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 145 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(
+        kBackgroundTrayPadding, kBackgroundTrayPadding, kBackgroundTrayPadding,
+        kBackgroundTrayPadding));
+  }
+}
+
 }  // namespace ash