Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(372)

Unified Diff: ash/common/system/tray/tray_background_view.cc

Issue 2618383003: Remove the extra separator appears on the right side of the shelf (Closed)
Patch Set: update name Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/common/system/tray/tray_background_view.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 3da2d1b35243478513dce07313447ed283c80ac6..4fdc3dcf30b35fcd3e4fa62dac4f8c228099127b 100644
--- a/ash/common/system/tray/tray_background_view.cc
+++ b/ash/common/system/tray/tray_background_view.cc
@@ -291,6 +291,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);
@@ -581,7 +582,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
« no previous file with comments | « ash/common/system/tray/tray_background_view.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698