| Index: ash/common/system/tray/tray_background_view.cc
|
| diff --git a/ash/common/system/tray/tray_background_view.cc b/ash/common/system/tray/tray_background_view.cc
|
| index fe4420885588f9e45f9968ec590ad7a332be7152..ff2c6389346b400ad90c982fa7e76a7aee6681d7 100644
|
| --- a/ash/common/system/tray/tray_background_view.cc
|
| +++ b/ash/common/system/tray/tray_background_view.cc
|
| @@ -289,6 +289,7 @@ TrayBackgroundView::TrayBackgroundView(WmShelf* wm_shelf)
|
| shelf_alignment_(SHELF_ALIGNMENT_BOTTOM),
|
| background_(NULL),
|
| is_active_(false),
|
| + separator_visible_(true),
|
| widget_observer_(new TrayWidgetObserver(this)) {
|
| DCHECK(wm_shelf_);
|
| set_notify_enter_exit_on_child(true);
|
| @@ -584,7 +585,8 @@ void TrayBackgroundView::OnPaint(gfx::Canvas* canvas) {
|
| ActionableView::OnPaint(canvas);
|
| if (!MaterialDesignController::IsShelfMaterial() ||
|
| shelf()->GetBackgroundType() ==
|
| - ShelfBackgroundType::SHELF_BACKGROUND_DEFAULT) {
|
| + ShelfBackgroundType::SHELF_BACKGROUND_DEFAULT ||
|
| + !separator_visible_) {
|
| return;
|
| }
|
| // In the given |canvas|, for a horizontal shelf draw a separator line to the
|
|
|