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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2510603003: Add ink drop ripple to status tray (Closed)
Patch Set: Addressed review comments Created 4 years, 1 month 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 | « no previous file | ash/common/system/tray/tray_background_view.h » ('j') | ash/common/system/tray/tray_background_view.h » ('J')
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 17491859c8472a95fa95bc739c24785afef98356..c4fbe76bf9c0267e6775f3fdd921a17ededd88a0 100644
--- a/ash/common/system/tray/system_tray.cc
+++ b/ash/common/system/tray/system_tray.cc
@@ -225,7 +225,12 @@ SystemTray::SystemTray(WmShelf* wm_shelf)
tray_update_(nullptr),
screen_capture_tray_item_(nullptr),
screen_share_tray_item_(nullptr) {
- SetContentsBackground(true);
+ if (MaterialDesignController::IsShelfMaterial()) {
+ SetInkDropMode(InkDropMode::ON);
+ SetContentsBackground(false);
+ } else {
+ SetContentsBackground(true);
+ }
}
SystemTray::~SystemTray() {
« no previous file with comments | « no previous file | ash/common/system/tray/tray_background_view.h » ('j') | ash/common/system/tray/tray_background_view.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698