| Index: ui/message_center/views/message_view.cc
|
| diff --git a/ui/message_center/views/message_view.cc b/ui/message_center/views/message_view.cc
|
| index 11ff5485f86612ed4314d70b68a786060404df56..52bc4f29797594411aaea1084ba3b9c15570488e 100644
|
| --- a/ui/message_center/views/message_view.cc
|
| +++ b/ui/message_center/views/message_view.cc
|
| @@ -15,6 +15,7 @@
|
| #include "ui/message_center/message_center.h"
|
| #include "ui/message_center/message_center_style.h"
|
| #include "ui/message_center/views/padded_button.h"
|
| +#include "ui/message_center/views/small_image_mask.h"
|
| #include "ui/views/background.h"
|
| #include "ui/views/controls/button/image_button.h"
|
| #include "ui/views/controls/image_view.h"
|
| @@ -54,8 +55,9 @@ MessageView::MessageView(MessageViewController* controller,
|
| views::Background::CreateSolidBackground(kNotificationBackgroundColor));
|
| AddChildView(background_view_);
|
|
|
| + const gfx::ImageSkia masked_small_image = GetMaskedSmallImage(small_image);
|
| views::ImageView* small_image_view = new views::ImageView();
|
| - small_image_view->SetImage(small_image);
|
| + small_image_view->SetImage(masked_small_image);
|
| small_image_view->SetImageSize(gfx::Size(kSmallImageSize, kSmallImageSize));
|
| // The small image view should be added to view hierarchy by the derived
|
| // class. This ensures that it is on top of other views.
|
| @@ -84,7 +86,9 @@ MessageView::~MessageView() {
|
| }
|
|
|
| void MessageView::UpdateWithNotification(const Notification& notification) {
|
| - small_image_view_->SetImage(notification.small_image().AsImageSkia());
|
| + const gfx::ImageSkia masked_small_image =
|
| + GetMaskedSmallImage(notification.small_image().AsImageSkia());
|
| + small_image_view_->SetImage(masked_small_image);
|
| display_source_ = notification.display_source();
|
| }
|
|
|
|
|