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

ash/common/system/chromeos/virtual_keyboard/virtual_keyboard_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/virtual_keyboard/virtual_keyboard_tray.h"
 
 #include <algorithm>
 
 #include "ash/common/keyboard/keyboard_ui.h"
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/shelf/shelf_constants.h"
+#include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/shelf/wm_shelf_util.h"
+#include "ash/common/system/chromeos/session/logout_button_tray.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_utils.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/events/event.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/gfx/vector_icons_public.h"
 #include "ui/views/controls/button/image_button.h"
 
 namespace ash {
 
 VirtualKeyboardTray::VirtualKeyboardTray(WmShelf* wm_shelf)
-    : TrayBackgroundView(wm_shelf), button_(nullptr) {
+    : TrayBackgroundView(wm_shelf),
+      button_(nullptr),
+      logout_button_tray_(nullptr) {
   button_ = new views::ImageButton(this);
   if (MaterialDesignController::IsShelfMaterial()) {
     gfx::ImageSkia image_md =
         CreateVectorIcon(gfx::VectorIconId::SHELF_KEYBOARD, kShelfIconColor);
     button_->SetImage(views::CustomButton::STATE_NORMAL, &image_md);
   } else {
     gfx::ImageSkia* image_non_md =
         ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
             IDR_AURA_UBER_TRAY_VIRTUAL_KEYBOARD);
     button_->SetImage(views::CustomButton::STATE_NORMAL, image_non_md);
   }
   button_->SetImageAlignment(views::ImageButton::ALIGN_CENTER,
                              views::ImageButton::ALIGN_MIDDLE);
 
   tray_container()->AddChildView(button_);
   button_->SetFocusBehavior(FocusBehavior::NEVER);
   SetContentsBackground();
   // The Shell may not exist in some unit tests.
   if (WmShell::HasInstance())
     WmShell::Get()->keyboard_ui()->AddObserver(this);
 }
 
 VirtualKeyboardTray::~VirtualKeyboardTray() {
   // The Shell may not exist in some unit tests.
   if (WmShell::HasInstance())
     WmShell::Get()->keyboard_ui()->RemoveObserver(this);
 }
 
+void VirtualKeyboardTray::Shutdown() {
+  DCHECK(logout_button_tray_);
+  logout_button_tray_ = nullptr;
+}
+
+void VirtualKeyboardTray::InitializeTrayItems(
+    LogoutButtonTray* logout_button_tray) {
+  logout_button_tray_ = logout_button_tray;
+  TrayBackgroundView::Initialize();
+}
+
 void VirtualKeyboardTray::SetShelfAlignment(ShelfAlignment alignment) {
   TrayBackgroundView::SetShelfAlignment(alignment);
-  tray_container()->SetBorder(views::Border::NullBorder());
 
   // Pad button size to align with other controls in the system tray.
   const gfx::ImageSkia image =
       button_->GetImage(views::CustomButton::STATE_NORMAL);
   const int size = GetTrayConstant(VIRTUAL_KEYBOARD_BUTTON_SIZE);
   const int vertical_padding = (size - image.height()) / 2;
   int horizontal_padding = (size - image.width()) / 2;
   if (!ash::MaterialDesignController::IsShelfMaterial() &&
       IsHorizontalAlignment(alignment)) {
     // Square up the padding if horizontally aligned. Avoid extra padding when
@@ skipping 24 matching lines @@
 void VirtualKeyboardTray::ButtonPressed(views::Button* sender,
                                         const ui::Event& event) {
   DCHECK_EQ(button_, sender);
   PerformAction(event);
 }
 
 void VirtualKeyboardTray::OnKeyboardEnabledStateChanged(bool new_value) {
   SetVisible(WmShell::Get()->keyboard_ui()->IsEnabled());
 }
 
+void VirtualKeyboardTray::OnPaint(gfx::Canvas* canvas) {
+  // Paints a 1px separator to separate with the tray to the right. No separator
+  // requires in front of Logout Button because it is red and appealing by

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

How about:
Paints a line to separate from the subsequent tray items. No leading separator
is required before the Logout button because that button's red background is
distinctive on its own.

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

No need to emphasize that the separator is 1px? I like your wording better thou.

+  // itself.
+  if (!logout_button_tray_->visible())
+    DrawSeparator(canvas);
+}
+
 }  // namespace ash