Chromium Code Reviews| Index: ui/message_center/views/message_center_bubble.cc |
| diff --git a/ui/message_center/views/message_center_bubble.cc b/ui/message_center/views/message_center_bubble.cc |
| index 10322211599520d2d0dbb1ff8f99372e88a5e50d..17d0c7043a2d5e62b052d50ab227c572430e3827 100644 |
| --- a/ui/message_center/views/message_center_bubble.cc |
| +++ b/ui/message_center/views/message_center_bubble.cc |
| @@ -289,7 +289,7 @@ class BoundedScrollView : public views::ScrollView { |
| // Displays a list of messages. |
| class MessageListView : public views::View { |
| public: |
| - MessageListView() { |
| + MessageListView(views::View* container) : container_(container) { |
| if (IsRichNotificationEnabled()) { |
| // Set the margin to 0 for the layout. BoxLayout assumes the same margin |
| // for top and bottom, but the bottom margin here should be smaller |
| @@ -319,7 +319,15 @@ class MessageListView : public views::View { |
| virtual ~MessageListView() { |
| } |
| + protected: |
| + // Overridden from views::View: |
| + void ChildPreferredSizeChanged(View* child) { |
| + container_->Layout(); |
| + } |
|
dharcourt
2013/03/13 22:47:51
Without this the MessageCenterView never would get
|
| + |
| private: |
| + views::View* container_; // Weak reference. |
| + |
| DISALLOW_COPY_AND_ASSIGN(MessageListView); |
| }; |
| @@ -353,7 +361,7 @@ class MessageCenterView : public views::View { |
| scroller_->layer()->SetMasksToBounds(true); |
| } |
| - message_list_view_ = new MessageListView(); |
| + message_list_view_ = new MessageListView(this); |
| scroller_->SetContents(message_list_view_); |
| AddChildView(scroller_); |