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

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

Issue 2723843002: Remove non-MD code from TrayBackgroundView (Closed)
Patch Set: Rebased Created 3 years, 9 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/overview/overview_button_tray.cc ('k') | ash/common/system/tray/tray_background_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/system/tray/system_tray.cc
diff --git a/ash/common/system/tray/system_tray.cc b/ash/common/system/tray/system_tray.cc
index 8c2d237b797dc7b1b35fa31870a4692f5f0ae2c0..73c9fc6a137fb6eae3457e9db973ec705ebb12e2 100644
--- a/ash/common/system/tray/system_tray.cc
+++ b/ash/common/system/tray/system_tray.cc
@@ -204,7 +204,7 @@ class SystemTray::ActivationObserver
// SystemTray
SystemTray::SystemTray(WmShelf* wm_shelf)
- : TrayBackgroundView(wm_shelf),
+ : TrayBackgroundView(wm_shelf, true),
web_notification_tray_(nullptr),
detailed_item_(nullptr),
default_bubble_height_(0),
@@ -221,14 +221,11 @@ SystemTray::SystemTray(WmShelf* wm_shelf)
screen_share_tray_item_(nullptr) {
if (MaterialDesignController::IsShelfMaterial()) {
SetInkDropMode(InkDropMode::ON);
- SetContentsBackground(false);
// Since user avatar is on the right hand side of System tray of a
// horizontal shelf and that is sufficient to indicate separation, no
// separator is required.
set_separator_visibility(false);
- } else {
- SetContentsBackground(true);
}
}
« no previous file with comments | « ash/common/system/overview/overview_button_tray.cc ('k') | ash/common/system/tray/tray_background_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698