Chromium Code Reviews| Index: ash/system/web_notification/web_notification_tray.cc |
| diff --git a/ash/system/web_notification/web_notification_tray.cc b/ash/system/web_notification/web_notification_tray.cc |
| index afdb9df6ab1a611d2337b1b188d34cc973b282e7..f0a229eef037a144e3cd2e4a8d4cb033e96c1679 100644 |
| --- a/ash/system/web_notification/web_notification_tray.cc |
| +++ b/ash/system/web_notification/web_notification_tray.cc |
| @@ -5,6 +5,8 @@ |
| #include "ash/system/web_notification/web_notification_tray.h" |
| #include "ash/ash_switches.h" |
| +#include "ash/common/material_design/material_design_controller.h" |
| +#include "ash/common/shelf/shelf_constants.h" |
| #include "ash/common/shelf/wm_shelf_util.h" |
| #include "ash/common/shell_window_ids.h" |
| #include "ash/common/wm_lookup.h" |
| @@ -123,9 +125,13 @@ class WebNotificationButton : public views::CustomButton { |
| unread_count_(0) { |
| SetLayoutManager(new views::FillLayout); |
| - no_unread_icon_.SetImage(gfx::CreateVectorIcon( |
| - gfx::VectorIconId::NOTIFICATIONS, kNoUnreadIconSize, |
| - kWebNotificationColorNoUnread)); |
| + gfx::ImageSkia image_md = CreateVectorIcon( |
|
James Cook
2016/06/09 19:24:48
ditto
tdanderson
2016/06/09 22:36:33
Done.
|
| + gfx::VectorIconId::SHELF_NOTIFICATIONS, kShelfIconColor); |
| + gfx::ImageSkia image_non_md = |
| + CreateVectorIcon(gfx::VectorIconId::NOTIFICATIONS, kNoUnreadIconSize, |
| + kWebNotificationColorNoUnread); |
| + no_unread_icon_.SetImage( |
| + MaterialDesignController::IsMaterial() ? image_md : image_non_md); |
| no_unread_icon_.set_owned_by_client(); |
| unread_label_.set_owned_by_client(); |