[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"
@@ skipping 43 matching lines @@
   UnobserveKeyboardController();
   // The Shell may not exist in some unit tests.
   if (WmShell::HasInstance())
     WmShell::Get()->keyboard_ui()->RemoveObserver(this);
 }
 
 void VirtualKeyboardTray::SetShelfAlignment(ShelfAlignment alignment) {
   if (alignment == shelf_alignment())
     return;
 
+  if (!ash::MaterialDesignController::IsShelfMaterial() &&
+      IsHorizontalAlignment(alignment)) {
+    // Pad button size to align with other controls in the system tray.
+    const gfx::ImageSkia image = icon_->GetImage();
+    const int size = GetTrayConstant(VIRTUAL_KEYBOARD_BUTTON_SIZE);
+    const int vertical_padding = (size - image.height()) / 2;
+    int horizontal_padding = (size - image.width()) / 2;
+
+    // Square up the padding if horizontally aligned. Avoid extra padding when
+    // vertically aligned as the button would violate the width constraint on
+    // the shelf.
+    horizontal_padding += std::max(0, vertical_padding - horizontal_padding);

[James Cook, 2016/08/11 20:36:54]

horizontal_padding isn't used after this line

[yiyix, 2016/08/18 00:42:59]

Sorry, I had these from merge, I did not check carefully.

+  }
+
   TrayBackgroundView::SetShelfAlignment(alignment);
   SetIconBorderForShelfAlignment();
 }
 
 base::string16 VirtualKeyboardTray::GetAccessibleNameForTray() {
   return l10n_util::GetStringUTF16(
       IDS_ASH_VIRTUAL_KEYBOARD_TRAY_ACCESSIBLE_NAME);
 }
 
 void VirtualKeyboardTray::HideBubbleWithView(
@@ skipping 17 matching lines @@
     UnobserveKeyboardController();
   }
 }
 
 void VirtualKeyboardTray::OnKeyboardBoundsChanging(
     const gfx::Rect& new_bounds) {
   SetDrawBackgroundAsActive(!new_bounds.IsEmpty());
 }
 
 void VirtualKeyboardTray::SetIconBorderForShelfAlignment() {
-  // Every time shelf alignment is updated, StatusAreaWidgetDelegate resets the
-  // border to a non-null border. So, we need to remove it.
-  tray_container()->SetBorder(views::Border::NullBorder());

[James Cook, 2016/08/11 20:36:54]

Q: Are you sure this isn't needed anymore? I thought mohsen just added it?

[yiyix, 2016/08/18 00:42:59]

One of the change I made it to initialize the border as null in the
traybackgroundview, then add the padding around SystemTray and OverviewTray;
where as before we initialize the padding in traybackgroundview and change the
border to null in notification, virtual_keyboard (the one @mohsen just added),
etc. I think it is better to add them as needed; and it also gives the
flexibility of adjusting the padding size.

-
   const gfx::ImageSkia& image = icon_->GetImage();
   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(shelf_alignment())) {
     // Square up the padding if horizontally aligned. Avoid extra padding when
     // vertically aligned as the button would violate the width constraint on
     // the shelf.
     horizontal_padding += std::max(0, vertical_padding - horizontal_padding);
   }

[James Cook, 2016/08/11 20:36:54]

There seems to be some duplication between this code and the SetShelfAlignment()
code above. Do you need both? If so, can it be shared?

[yiyix, 2016/08/18 00:43:00]

The earlier one means needs to be deleted.

   icon_->SetBorder(views::Border::CreateEmptyBorder(
       gfx::Insets(vertical_padding, horizontal_padding)));
 }
 
 void VirtualKeyboardTray::ObserveKeyboardController() {
   keyboard::KeyboardController* keyboard_controller =
       keyboard::KeyboardController::GetInstance();
   if (keyboard_controller)
     keyboard_controller->AddObserver(this);
 }
 
 void VirtualKeyboardTray::UnobserveKeyboardController() {
   keyboard::KeyboardController* keyboard_controller =
       keyboard::KeyboardController::GetInstance();
   if (keyboard_controller)
     keyboard_controller->RemoveObserver(this);
 }
 
 }  // namespace ash