| Index: ui/message_center/views/notification_view.h
|
| diff --git a/ui/message_center/views/notification_view.h b/ui/message_center/views/notification_view.h
|
| index 6621ecda13ed0cecd60c7f6b7c7b3067f3224cae..91d4a612e24be5d8a77f538f02efb7138a749021 100644
|
| --- a/ui/message_center/views/notification_view.h
|
| +++ b/ui/message_center/views/notification_view.h
|
| @@ -18,7 +18,7 @@ namespace message_center {
|
|
|
| class BoundedLabel;
|
| class MessageCenter;
|
| -class NotificationView;
|
| +class NotificationViewContextMenuController;
|
| class PaddedButton;
|
|
|
| // View that displays all current types of notification (web, basic, image, and
|
| @@ -65,8 +65,6 @@ class MESSAGE_CENTER_EXPORT NotificationView : public MessageView {
|
| // Overrides from base class MessageView:
|
| virtual void ClickOnNotification() OVERRIDE;
|
| virtual void RemoveNotification(bool by_user) OVERRIDE;
|
| - virtual void DisableNotificationsFromThisSource() OVERRIDE;
|
| - virtual void ShowNotifierSettingsBubble() OVERRIDE;
|
|
|
| private:
|
| bool IsExpansionNeeded(int width);
|
| @@ -76,7 +74,6 @@ class MESSAGE_CENTER_EXPORT NotificationView : public MessageView {
|
| int GetMessageHeight(int width, int limit);
|
|
|
| MessageCenter* message_center_; // Weak.
|
| - MessageCenterTray* tray_; // Weak.
|
| std::string notification_id_;
|
| message_center::NotifierId notifier_id_;
|
|
|
| @@ -98,6 +95,8 @@ class MESSAGE_CENTER_EXPORT NotificationView : public MessageView {
|
| std::vector<views::View*> action_buttons_;
|
| PaddedButton* expand_button_;
|
|
|
| + scoped_ptr<NotificationViewContextMenuController> context_menu_controller_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(NotificationView);
|
| };
|
|
|
|
|