Index: ash/common/system/web_notification/web_notification_tray.h |
diff --git a/ash/common/system/web_notification/web_notification_tray.h b/ash/common/system/web_notification/web_notification_tray.h |
index 1d13ffcfc50977f575a7b340b73f2b515271c813..0817c970cacd888e4c65aae0d50eee62398c50d8 100644 |
--- a/ash/common/system/web_notification/web_notification_tray.h |
+++ b/ash/common/system/web_notification/web_notification_tray.h |
@@ -14,6 +14,7 @@ |
#include "base/macros.h" |
#include "base/memory/weak_ptr.h" |
#include "ui/base/models/simple_menu_model.h" |
+#include "ui/gfx/animation/animation_container.h" |
#include "ui/message_center/message_center_tray.h" |
#include "ui/message_center/message_center_tray_delegate.h" |
#include "ui/views/bubble/tray_bubble_view.h" |
@@ -41,7 +42,9 @@ namespace ash { |
class AshPopupAlignmentDelegate; |
class SystemTray; |
class WebNotificationBubbleWrapper; |
-class WebNotificationIcon; |
+class WebNotificationButton; |
+class WebNotificationImage; |
+class WebNotificationLabel; |
class WmWindow; |
class ASH_EXPORT WebNotificationTray |
@@ -56,6 +59,8 @@ class ASH_EXPORT WebNotificationTray |
SystemTray* system_tray); |
~WebNotificationTray() override; |
+ static void DisableAnimationsForTest(bool disable); |
+ |
// Sets the height of the system tray bubble (or legacy notification bubble) |
// from the edge of the work area so that the web notification popups don't |
// overlap with the tray. Pass 0 if no bubble is shown. |
@@ -113,7 +118,7 @@ class ASH_EXPORT WebNotificationTray |
bool IsContextMenuEnabled() const override; |
message_center::MessageCenterTray* GetMessageCenterTray() override; |
- // Overridden from SimpleMenuModel::Delegate. |
+ // Overridden from ui::SimpleMenuModel::Delegate. |
bool IsCommandIdChecked(int command_id) const override; |
bool IsCommandIdEnabled(int command_id) const override; |
void ExecuteCommand(int command_id, int event_flags) override; |
@@ -169,7 +174,13 @@ class ASH_EXPORT WebNotificationTray |
std::unique_ptr<message_center::MessageCenterTray> message_center_tray_; |
std::unique_ptr<WebNotificationBubbleWrapper> message_center_bubble_; |
std::unique_ptr<message_center::MessagePopupCollection> popup_collection_; |
- WebNotificationIcon* icon_; |
+ std::unique_ptr<WebNotificationImage> bell_icon_; |
+ std::unique_ptr<WebNotificationLabel> counter_; |
+ |
+ scoped_refptr<gfx::AnimationContainer> animation_container_ = |
+ new gfx::AnimationContainer(); |
+ |
+ std::unordered_map<std::string, WebNotificationImage*> visible_small_icons_; |
bool show_message_center_on_unlock_; |