Remove the extra separator appears on the right side of the shelf

ash/common/system/tray/tray_background_view.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/tray_background_view.h"
 
 #include <algorithm>
 
 #include "ash/common/ash_constants.h"
 #include "ash/common/material_design/material_design_controller.h"
@@ skipping 273 matching lines @@
 // TrayBackgroundView
 
 TrayBackgroundView::TrayBackgroundView(WmShelf* wm_shelf)
     // Note the ink drop style is ignored.
     : ActionableView(nullptr, TrayPopupInkDropStyle::FILL_BOUNDS),
       wm_shelf_(wm_shelf),
       tray_container_(NULL),
       shelf_alignment_(SHELF_ALIGNMENT_BOTTOM),
       background_(NULL),
       is_active_(false),
+      is_separator_visible_(true),
       widget_observer_(new TrayWidgetObserver(this)) {
   DCHECK(wm_shelf_);
   set_notify_enter_exit_on_child(true);
   set_ink_drop_base_color(kShelfInkDropBaseColor);
   set_ink_drop_visible_opacity(kShelfInkDropVisibleOpacity);
 
   tray_container_ = new TrayContainer(shelf_alignment_);
   SetContents(tray_container_);
   tray_event_filter_.reset(new TrayEventFilter);
 
@@ skipping 209 matching lines @@
   // Nothing to do here.
 }
 
 void TrayBackgroundView::UpdateShelfItemBackground(int alpha) {
   if (background_) {
     background_->set_alpha(alpha);
     SchedulePaint();
   }
 }
 
+void TrayBackgroundView::SetSeparatorVisibility(bool is_shown) {

[James Cook, 2017/01/09 23:50:53]

nit: whatever you choose in the header, make sure this matches the header

[yiyix, 2017/01/10 01:02:53]

Done.

+  if (is_separator_visible_ == is_shown)
+    return;
+  is_separator_visible_ = is_shown;
+  SchedulePaint();

[James Cook, 2017/01/09 23:50:53]

Is this needed? The two places you call SetSeparatorVisibility() are in
constructors, so it doesn't seem to me like you would need to schedule a paint.

If you don't need this then the function could be set_separator_visible() in the
header (or similar).

[yiyix, 2017/01/10 01:02:53]

I don't need SchedulePaint() now. I was thinking how separator_visible setting
can be used in the future. I think i have complicated the problem.

+}
+
 views::View* TrayBackgroundView::GetBubbleAnchor() const {
   return tray_container_;
 }
 
 gfx::Insets TrayBackgroundView::GetBubbleAnchorInsets() const {
   gfx::Insets anchor_insets = GetBubbleAnchor()->GetInsets();
   gfx::Insets tray_bg_insets = GetInsets();
   if (GetAnchorAlignment() == TrayBubbleView::ANCHOR_ALIGNMENT_BOTTOM) {
     return gfx::Insets(-tray_bg_insets.top(), anchor_insets.left(),
                        -tray_bg_insets.bottom(), anchor_insets.right());
@@ skipping 41 matching lines @@
     paint_bounds.Inset(gfx::Insets(1));
   }
   canvas->DrawSolidFocusRect(paint_bounds, kFocusBorderColor,
                              kFocusBorderThickness);
 }
 
 void TrayBackgroundView::OnPaint(gfx::Canvas* canvas) {
   ActionableView::OnPaint(canvas);
   if (!MaterialDesignController::IsShelfMaterial() ||
       shelf()->GetBackgroundType() ==
-          ShelfBackgroundType::SHELF_BACKGROUND_DEFAULT) {
+          ShelfBackgroundType::SHELF_BACKGROUND_DEFAULT ||
+      !is_separator_visible_) {
     return;
   }
   //  In the given |canvas|, for a horizontal shelf draw a separator line to the
   //  right or left of the TrayBackgroundView when the system is LTR or RTL
   //  aligned, respectively. For a vertical shelf draw the separator line
   //  underneath the items instead.
   const bool horizontal_shelf = IsHorizontalAlignment(shelf_alignment_);
   const gfx::Rect local_bounds = GetLocalBounds();
   const int height = kTrayItemSize;
   const int x =
@@ skipping 36 matching lines @@
 }
 
 gfx::Rect TrayBackgroundView::GetBackgroundBounds() const {
   gfx::Insets insets = GetBackgroundInsets();
   gfx::Rect bounds = GetLocalBounds();
   bounds.Inset(insets);
   return bounds;
 }
 
 }  // namespace ash