| Index: ui/message_center/views/message_center_view.h
|
| diff --git a/ui/message_center/views/message_center_view.h b/ui/message_center/views/message_center_view.h
|
| index 2b9691ca6ebebdf5317d9882150556a7a2797564..972bdeb970785d5d8a79455a3d6a297e4a49505e 100644
|
| --- a/ui/message_center/views/message_center_view.h
|
| +++ b/ui/message_center/views/message_center_view.h
|
| @@ -54,6 +54,7 @@ class MESSAGE_CENTER_EXPORT MessageCenterView : public views::View,
|
| size_t NumMessageViewsForTest() const;
|
|
|
| void SetSettingsVisible(bool visible);
|
| + void OnSettingsChanged();
|
| bool settings_visible() const { return settings_visible_; }
|
|
|
| protected:
|
| @@ -84,7 +85,9 @@ class MESSAGE_CENTER_EXPORT MessageCenterView : public views::View,
|
|
|
| MessageCenter* message_center_; // Weak reference.
|
| MessageCenterTray* tray_; // Weak reference.
|
| - std::vector<MessageView*> message_views_;
|
| + std::vector<MessageView*> message_views_; // Weak references.
|
| +
|
| + // Child views.
|
| views::ScrollView* scroller_;
|
| MessageListView* message_list_view_;
|
| NotifierSettingsView* settings_view_;
|
| @@ -94,11 +97,17 @@ class MESSAGE_CENTER_EXPORT MessageCenterView : public views::View,
|
|
|
| // Data for transition animation between settings view and message list.
|
| bool settings_visible_;
|
| +
|
| + // Animation managing transition between message center and settings (and vice
|
| + // versa).
|
| + scoped_ptr<ui::MultiAnimation> settings_transition_animation_;
|
| +
|
| + // Helper data to keep track of the transition between settings and
|
| + // message center views.
|
| views::View* source_view_;
|
| - views::View* target_view_;
|
| int source_height_;
|
| + views::View* target_view_;
|
| int target_height_;
|
| - scoped_ptr<ui::MultiAnimation> settings_transition_animation_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(MessageCenterView);
|
| };
|
|
|