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 6938498016b13a470ac9069fa7106f7aa32b32c9..46b60d1340f687ba60f59f93f3051ac9d231b87a 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" |
@@ -44,13 +45,14 @@ class AshPopupAlignmentDelegate; |
class SystemTray; |
class WebNotificationBubbleWrapper; |
class WebNotificationButton; |
+class WebNotificationImage; |
+class WebNotificationLabel; |
class WmWindow; |
class ASH_EXPORT WebNotificationTray |
: public TrayBackgroundView, |
public views::TrayBubbleView::Delegate, |
public message_center::MessageCenterTrayDelegate, |
- public views::ButtonListener, |
public base::SupportsWeakPtr<WebNotificationTray>, |
public ui::SimpleMenuModel::Delegate { |
public: |
@@ -106,9 +108,6 @@ class ASH_EXPORT WebNotificationTray |
views::Widget::InitParams* params) const override; |
void HideBubble(const views::TrayBubbleView* bubble_view) override; |
- // Overridden from ButtonListener. |
- void ButtonPressed(views::Button* sender, const ui::Event& event) override; |
- |
// Overridden from MessageCenterTrayDelegate. |
void OnMessageCenterTrayChanged() override; |
bool ShowMessageCenter() override; |
@@ -119,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; |
@@ -175,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_; |
- WebNotificationButton* button_; |
+ std::unique_ptr<WebNotificationImage> bell_icon_; |
+ std::unique_ptr<WebNotificationLabel> counter_; |
+ |
+ scoped_refptr<gfx::AnimationContainer> animation_container_ = |
+ new gfx::AnimationContainer(); |
+ |
+ std::map<std::string, WebNotificationImage*> visible_small_icons_; |
oshima
2016/08/04 18:15:21
is order important? if not, unordered_map
yoshiki
2016/08/05 13:30:48
Let me use unordered_map.
|
bool show_message_center_on_unlock_; |