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

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

Issue 2499453002: Add ink drop ripple to overview mode button (Closed)
Patch Set: Fixed crash when there is no window 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
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 731855c295c69d2d3a162aa40785ebb3186237a8..3f6e533c99989e13e8791e1027f8da8c956393a7 100644
--- a/ash/common/system/tray/system_tray.cc
+++ b/ash/common/system/tray/system_tray.cc
@@ -217,7 +217,7 @@ SystemTray::SystemTray(WmShelf* wm_shelf)
tray_update_(nullptr),
screen_capture_tray_item_(nullptr),
screen_share_tray_item_(nullptr) {
- SetContentsBackground();
+ SetContentsBackground(true);
}
SystemTray::~SystemTray() {
@@ -655,7 +655,7 @@ void SystemTray::ShowItems(const std::vector<SystemTrayItem*>& items,
// When we show the system menu in our alternate shelf layout, we need to
// tint the background.
if (full_system_tray_menu_)
- SetDrawBackgroundAsActive(true);
+ SetIsActive(true);
}
void SystemTray::UpdateNotificationBubble() {
@@ -925,7 +925,7 @@ void SystemTray::CloseSystemBubbleAndDeactivateSystemTray() {
// When closing a system bubble with the alternate shelf layout, we need to
// turn off the active tinting of the shelf.
if (full_system_tray_menu_) {
- SetDrawBackgroundAsActive(false);
+ SetIsActive(false);
full_system_tray_menu_ = false;
}
}

Powered by Google App Engine
This is Rietveld 408576698