| Index: ash/system/web_notification/web_notification_tray.h
|
| diff --git a/ash/system/web_notification/web_notification_tray.h b/ash/system/web_notification/web_notification_tray.h
|
| index 999657ede20442bca609eee789e06c202a61dd2d..772746e4c66f95e4e2dd55939ad8ebeef5b66111 100644
|
| --- a/ash/system/web_notification/web_notification_tray.h
|
| +++ b/ash/system/web_notification/web_notification_tray.h
|
| @@ -33,7 +33,6 @@ namespace message_center {
|
| class MessageBubbleBase;
|
| class MessageCenter;
|
| class MessageCenterBubble;
|
| -class MessagePopupBubble;
|
| class MessagePopupCollection;
|
| }
|
|
|
| @@ -104,7 +103,6 @@ class ASH_EXPORT WebNotificationTray
|
| virtual bool ShowMessageCenter() OVERRIDE;
|
| virtual void HideMessageCenter() OVERRIDE;
|
| virtual bool ShowPopups() OVERRIDE;
|
| - virtual void UpdatePopups() OVERRIDE;
|
| virtual void HidePopups() OVERRIDE;
|
| virtual bool ShowNotifierSettings() OVERRIDE;
|
|
|
| @@ -138,18 +136,12 @@ class ASH_EXPORT WebNotificationTray
|
| return message_center_bubble_.get();
|
| }
|
|
|
| - internal::WebNotificationBubbleWrapper* popup_bubble() const {
|
| - return popup_bubble_.get();
|
| - }
|
| -
|
| // Testing accessors.
|
| bool IsPopupVisible() const;
|
| message_center::MessageCenterBubble* GetMessageCenterBubbleForTest();
|
| - message_center::MessagePopupBubble* GetPopupBubbleForTest();
|
|
|
| scoped_ptr<message_center::MessageCenterTray> message_center_tray_;
|
| scoped_ptr<internal::WebNotificationBubbleWrapper> message_center_bubble_;
|
| - scoped_ptr<internal::WebNotificationBubbleWrapper> popup_bubble_;
|
| scoped_ptr<message_center::MessagePopupCollection> popup_collection_;
|
| scoped_ptr<views::MenuRunner> quiet_mode_menu_runner_;
|
| internal::WebNotificationButton* button_;
|
|
|