Made notification center notifications collapsed and expandable.

ui/message_center/message_popup_collection.cc

Index: ui/message_center/message_popup_collection.cc
diff --git a/ui/message_center/message_popup_collection.cc b/ui/message_center/message_popup_collection.cc
index f964dd11082eb34882739ab3602a0ec41a9f859b..a2216ee7377943570984448f56ada95590070d57 100644
--- a/ui/message_center/message_popup_collection.cc
+++ b/ui/message_center/message_popup_collection.cc
@@ -81,7 +81,7 @@ class ToastContentsView : public views::WidgetDelegateView {
                             base::Unretained(GetWidget())));
   }
 
-  // views::WidgetDelegate overrides:
+  // Overridden from views::WidgetDelegate:
   virtual views::View* GetContentsView() OVERRIDE {
     return this;
   }
@@ -95,7 +95,7 @@ class ToastContentsView : public views::WidgetDelegateView {
     return false;
   }
 
-  // views::View overrides:
+  // Overridden from views::View:
   virtual void OnMouseEntered(const ui::MouseEvent& event) OVERRIDE {
     collection_->OnMouseEntered();
   }
@@ -113,12 +113,11 @@ class ToastContentsView : public views::WidgetDelegateView {
   DISALLOW_COPY_AND_ASSIGN(ToastContentsView);
 };
 
-MessagePopupCollection::MessagePopupCollection(
-    gfx::NativeView context,
-    NotificationList::Delegate* list_delegate)
+MessagePopupCollection::MessagePopupCollection(gfx::NativeView context,
+                                               MessageCenter* message_center)
     : context_(context),
-      list_delegate_(list_delegate) {
-  DCHECK(list_delegate_);
+      message_center_(message_center) {
+  DCHECK(message_center_);
 }
 
 MessagePopupCollection::~MessagePopupCollection() {
@@ -127,7 +126,7 @@ MessagePopupCollection::~MessagePopupCollection() {
 
 void MessagePopupCollection::UpdatePopups() {
   NotificationList::PopupNotifications popups =
-      list_delegate_->GetNotificationList()->GetPopupNotifications();
+      message_center_->notification_list()->GetPopupNotifications();
 
   if (popups.empty()) {
     CloseAllWidgets();
@@ -153,7 +152,12 @@ void MessagePopupCollection::UpdatePopups() {
       widget = toast_iter->second->GetWidget();
       old_toast_ids.erase((*iter)->id());
     } else {
-      MessageView* view = NotificationView::Create(*(*iter), list_delegate_);
+      // NotificationViews are expanded by default here because
+      // MessagePopupCollection hasn't been tested yet with changing subview
+      // sizes, and such changes could come if those subviews were initially
+      // collapsed and allowed to be expanded by users. TODO(dharcourt): Fix.
+      MessageView* view = NotificationView::Create(*(*iter), message_center_,
+                                                   true);
       ToastContentsView* toast = new ToastContentsView(*iter, view, this);
       widget = toast->CreateWidget(context_);
       widget->AddObserver(this);
@@ -232,7 +236,7 @@ void MessagePopupCollection::OnWidgetDestroying(views::Widget* widget) {
   for (ToastContainer::iterator iter = toasts_.begin();
        iter != toasts_.end(); ++iter) {
     if (iter->second->GetWidget() == widget) {
-      list_delegate_->GetNotificationList()->MarkSinglePopupAsShown(
+      message_center_->notification_list()->MarkSinglePopupAsShown(
           iter->first, false);
       toasts_.erase(iter);
       break;