Made notification center notifications collapsed and expandable.

ui/message_center/views/message_popup_collection.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/message_center/views/message_popup_collection.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/timer.h"
 #include "ui/gfx/screen.h"
+#include "ui/message_center/message_center.h"
 #include "ui/message_center/message_center_constants.h"
 #include "ui/message_center/notification.h"
 #include "ui/message_center/notification_list.h"
 #include "ui/message_center/views/message_view.h"
 #include "ui/message_center/views/notification_view.h"
 #include "ui/views/background.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
+#include "ui/views/widget/widget_delegate.h"
 
 namespace message_center {
 
 class ToastContentsView : public views::WidgetDelegateView {
  public:
   ToastContentsView(const Notification* notification,
                     MessagePopupCollection* collection)
       : collection_(collection) {
     DCHECK(collection_);
 
@@ skipping 47 matching lines @@
   }
 
   void StartTimer() {
     start_time_ = base::Time::Now();
     timer_.Start(FROM_HERE,
                  delay_,
                  base::Bind(&views::Widget::Close,
                             base::Unretained(GetWidget())));
   }
 
-  // views::WidgetDelegate overrides:
+  // Overridden from views::WidgetDelegate:
   virtual views::View* GetContentsView() OVERRIDE {
     return this;
   }
 
   virtual void WindowClosing() OVERRIDE {
     if (timer_.IsRunning())
       SuspendTimer();
   }
 
   virtual bool CanActivate() const OVERRIDE {
     return false;
   }
 
-  // views::View overrides:
+  // Overridden from views::View:
   virtual void OnMouseEntered(const ui::MouseEvent& event) OVERRIDE {
     collection_->OnMouseEntered();
   }
 
   virtual void OnMouseExited(const ui::MouseEvent& event) OVERRIDE {
     collection_->OnMouseExited();
   }
 
  private:
   base::TimeDelta delay_;
   base::Time start_time_;
   base::OneShotTimer<views::Widget> timer_;
   MessagePopupCollection* collection_;
 
   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() {
   CloseAllWidgets();
 }
 
 void MessagePopupCollection::UpdatePopups() {
   NotificationList::PopupNotifications popups =
-      list_delegate_->GetNotificationList()->GetPopupNotifications();
+      message_center_->notification_list()->GetPopupNotifications();
 
   if (popups.empty()) {
     CloseAllWidgets();
     return;
   }
 
   gfx::Screen* screen = gfx::Screen::GetScreenFor(context_);
   gfx::Rect work_area = screen->GetDisplayNearestWindow(context_).work_area();
 
   std::set<std::string> old_toast_ids;
   for (ToastContainer::iterator iter = toasts_.begin(); iter != toasts_.end();
        ++iter) {
     old_toast_ids.insert(iter->first);
   }
 
   int total_height = 0;
   std::vector<views::Widget*> widgets;
   for (NotificationList::PopupNotifications::const_iterator iter =
            popups.begin(); iter != popups.end(); ++iter) {
     ToastContainer::iterator toast_iter = toasts_.find((*iter)->id());
     views::Widget* widget = NULL;
-    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);
     if (toast_iter != toasts_.end()) {
       widget = toast_iter->second->GetWidget();
       old_toast_ids.erase((*iter)->id());
       // Need to replace the contents because |view| can be updated, like
       // image loads.
       toast_iter->second->SetContents(view);
     } else {
       ToastContentsView* toast = new ToastContentsView(*iter, this);
       toast->SetContents(view);
       widget = toast->CreateWidget(context_);
@@ skipping 66 matching lines @@
     widget->Close();
   }
   toasts_.clear();
 }
 
 void MessagePopupCollection::OnWidgetDestroying(views::Widget* widget) {
   widget->RemoveObserver(this);
   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;
     }
   }
   UpdatePopups();
 }
 
 }  // namespace message_center