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

Unified Diff: ash/common/system/web_notification/web_notification_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/tray/tray_background_view.cc ('k') | ash/resources/ash_resources.grd » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/system/web_notification/web_notification_tray.cc
diff --git a/ash/common/system/web_notification/web_notification_tray.cc b/ash/common/system/web_notification/web_notification_tray.cc
index e23627f6eb3dd44331fe934ef551eb6357c89489..440d8cbaad249e071896cd53d73bc470d7e9fbf4 100644
--- a/ash/common/system/web_notification/web_notification_tray.cc
+++ b/ash/common/system/web_notification/web_notification_tray.cc
@@ -285,7 +285,7 @@ class WebNotificationLabel : public WebNotificationItem {
WebNotificationTray::WebNotificationTray(WmShelf* shelf,
WmWindow* status_area_window,
SystemTray* system_tray)
- : TrayBackgroundView(shelf),
+ : TrayBackgroundView(shelf, true),
status_area_window_(status_area_window),
system_tray_(system_tray),
show_message_center_on_unlock_(false),
@@ -297,14 +297,12 @@ WebNotificationTray::WebNotificationTray(WmShelf* shelf,
if (MaterialDesignController::IsShelfMaterial()) {
SetInkDropMode(InkDropMode::ON);
- SetContentsBackground(false);
gfx::ImageSkia bell_image =
CreateVectorIcon(kShelfNotificationsIcon, kShelfIconColor);
const gfx::Size bell_icon_size = kTrayItemInnerIconSize;
bell_icon_.reset(new WebNotificationImage(
bell_image, bell_icon_size, animation_container_.get(), this));
} else {
- SetContentsBackground(true);
gfx::ImageSkia bell_image =
CreateVectorIcon(ui::kNotificationsIcon, kNoUnreadIconSize,
kWebNotificationColorNoUnread);
« no previous file with comments | « ash/common/system/tray/tray_background_view.cc ('k') | ash/resources/ash_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698