Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(561)

Unified Diff: ui/message_center/views/message_center_view.h

Issue 20066003: Update notification settings to allow for multiprofile situations. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: And remove unneeded include. Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 506a3a453357a3a22f2d8e8c66e66589c3d4791f..d53910c2734bfcf3709ffbfa147f07e803c8762d 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_; }
void SetIsClosing(bool is_closing);
@@ -86,7 +87,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_;
@@ -96,11 +99,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_;
// True when the widget is closing so that further operations should be
// ignored.
« no previous file with comments | « ui/message_center/views/message_center_button_bar.cc ('k') | ui/message_center/views/message_center_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698