Commit 5a32a95a authored by Ahmed Mehfooz's avatar Ahmed Mehfooz Committed by Commit Bot

Disable color for stacked notification icons

Temporarily disabling color for all notification types.
This will be enabled once ARC notifications provide accent color
in Chrome OS.

Bug: 1002714
Change-Id: I2fb6b6f33ee27dd2d2ecd865f7b5a6c360d00c27
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1838166Reviewed-by: default avatarTim Song <tengs@chromium.org>
Commit-Queue: Ahmed Mehfooz <amehfooz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#704427}
parent 230fdd96
......@@ -186,13 +186,6 @@ void StackedNotificationBar::SetAnimationState(
void StackedNotificationBar::AddNotificationIcon(
message_center::Notification* notification,
bool at_front) {
SkColor accent_color = notification->accent_color() == SK_ColorTRANSPARENT
? message_center::kNotificationDefaultAccentColor
: notification->accent_color();
gfx::Image masked_small_icon =
notification->GenerateMaskedSmallIcon(15, accent_color);
views::ImageView* icon_view_ = new views::ImageView();
if (at_front)
......@@ -200,10 +193,14 @@ void StackedNotificationBar::AddNotificationIcon(
else
notification_icons_container_->AddChildView(icon_view_);
gfx::Image masked_small_icon = notification->GenerateMaskedSmallIcon(
kStackedNotificationIconSize,
message_center::kNotificationDefaultAccentColor);
if (masked_small_icon.IsEmpty()) {
icon_view_->SetImage(gfx::CreateVectorIcon(message_center::kProductIcon,
kStackedNotificationIconSize,
accent_color));
icon_view_->SetImage(gfx::CreateVectorIcon(
message_center::kProductIcon, kStackedNotificationIconSize,
message_center::kNotificationDefaultAccentColor));
} else {
icon_view_->SetImage(masked_small_icon.AsImageSkia());
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment