| Index: ui/message_center/views/message_popup_collection.h
|
| diff --git a/ui/message_center/views/message_popup_collection.h b/ui/message_center/views/message_popup_collection.h
|
| index 48345d80d75c6784805b6ff69b36b6885691a08c..5aee25c829e4475ecf8a5a439dda20f714e4c71c 100644
|
| --- a/ui/message_center/views/message_popup_collection.h
|
| +++ b/ui/message_center/views/message_popup_collection.h
|
| @@ -42,6 +42,7 @@ class MessagePopupCollectionTest;
|
|
|
| class MessageCenter;
|
| class MessageCenterTray;
|
| +class MessageViewContextMenuController;
|
|
|
| enum PopupAlignment {
|
| POPUP_ALIGNMENT_TOP = 1 << 0,
|
| @@ -74,9 +75,9 @@ class MESSAGE_CENTER_EXPORT MessagePopupCollection
|
| virtual void ClickOnNotification(const std::string& notification_id) OVERRIDE;
|
| virtual void RemoveNotification(const std::string& notification_id,
|
| bool by_user) OVERRIDE;
|
| - virtual void DisableNotificationsFromThisSource(
|
| - const NotifierId& notifier_id) OVERRIDE;
|
| - virtual void ShowNotifierSettingsBubble() OVERRIDE;
|
| + virtual scoped_ptr<ui::MenuModel> CreateMenuModel(
|
| + const NotifierId& notifier_id,
|
| + const base::string16& display_source) OVERRIDE;
|
| virtual bool HasClickedListener(const std::string& notification_id) OVERRIDE;
|
| virtual void ClickOnNotificationButton(const std::string& notification_id,
|
| int button_index) OVERRIDE;
|
| @@ -216,6 +217,8 @@ class MESSAGE_CENTER_EXPORT MessagePopupCollection
|
| // True if the first item should not have spacing against the tray.
|
| bool first_item_has_no_margin_;
|
|
|
| + scoped_ptr<MessageViewContextMenuController> context_menu_controller_;
|
| +
|
| // Gives out weak pointers to toast contents views which have an unrelated
|
| // lifetime. Must remain the last member variable.
|
| base::WeakPtrFactory<MessagePopupCollection> weak_factory_;
|
|
|