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

ash/common/system/chromeos/session/logout_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/chromeos/session/logout_button_tray.h"
 
 #include <memory>
 #include <utility>
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/shelf/shelf_types.h"
+#include "ash/common/shelf/wm_shelf_observer.h"
 #include "ash/common/system/chromeos/session/logout_confirmation_controller.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/system/tray/system_tray_notifier.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_utils.h"
 #include "ash/common/system/user/login_status.h"
 #include "ash/common/wm_shell.h"
 #include "base/logging.h"
 #include "grit/ash_resources.h"
 #include "third_party/skia/include/core/SkColor.h"
@@ skipping 69 matching lines @@
                         kLogoutButtonHorizontalExtraPadding);
   border->set_insets(insets);
   SetBorder(std::move(border));
   set_animate_on_state_change(false);
 
   SetMinSize(gfx::Size(0, GetTrayConstant(TRAY_ITEM_HEIGHT_LEGACY)));
 }
 
 LogoutButton::~LogoutButton() {}
 
-LogoutButtonTray::LogoutButtonTray(WmShelf* wm_shelf)
-    : TrayBackgroundView(wm_shelf),
+LogoutButtonTray::LogoutButtonTray(WmShelf* wm_shelf,
+                                   WmShelfObserver* wm_shelf_observer)
+    : TrayBackgroundView(wm_shelf, wm_shelf_observer),
       button_(nullptr),
       login_status_(LoginStatus::NOT_LOGGED_IN),
       show_logout_button_in_tray_(false) {
   if (MaterialDesignController::IsShelfMaterial()) {
     views::MdTextButton* button =
         views::MdTextButton::CreateMdButton(this, base::string16());
     button->SetCallToAction(true);
     button->set_bg_color_override(gfx::kGoogleRed700);
     // Base font size + 2 = 14.
     // TODO(estade): should this 2 be shared with other tray views? See
     // crbug.com/623987
     button->AdjustFontSize(2);
     button->SetMinSize(gfx::Size(0, kTrayItemSize));
     button_ = button;
   } else {
     button_ = new LogoutButton(this);
   }
   tray_container()->AddChildView(button_);
-  tray_container()->SetBorder(views::Border::NullBorder());
   WmShell::Get()->system_tray_notifier()->AddLogoutButtonObserver(this);
 }
 
 LogoutButtonTray::~LogoutButtonTray() {
   WmShell::Get()->system_tray_notifier()->RemoveLogoutButtonObserver(this);
 }
 
 void LogoutButtonTray::SetShelfAlignment(ShelfAlignment alignment) {
   TrayBackgroundView::SetShelfAlignment(alignment);
-  tray_container()->SetBorder(views::Border::NullBorder());
 }
 
 base::string16 LogoutButtonTray::GetAccessibleNameForTray() {
   return button_->GetText();
 }
 
 void LogoutButtonTray::HideBubbleWithView(
     const views::TrayBubbleView* bubble_view) {}
 
 void LogoutButtonTray::ClickedOutsideBubble() {}
@@ skipping 28 matching lines @@
   UpdateVisibility();
 }
 
 void LogoutButtonTray::UpdateVisibility() {
   SetVisible(show_logout_button_in_tray_ &&
              login_status_ != LoginStatus::NOT_LOGGED_IN &&
              login_status_ != LoginStatus::LOCKED);
 }
 
 }  // namespace ash