Made notification center notifications collapsed and expandable.

ui/message_center/views/message_popup_bubble.cc

 // Copyright (c) 2012 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_bubble.h"
 
 #include "base/bind.h"
 #include "base/stl_util.h"
 #include "ui/message_center/message_center_constants.h"
 #include "ui/message_center/notification.h"
+#include "ui/message_center/notification_change_observer.h"
 #include "ui/message_center/notification_types.h"
 #include "ui/message_center/views/message_view.h"
 #include "ui/message_center/views/notification_view.h"
 #include "ui/views/bubble/tray_bubble_view.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
 namespace message_center {
 
 // Popup notifications contents.
 class PopupBubbleContentsView : public views::View {
  public:
-  explicit PopupBubbleContentsView(NotificationList::Delegate* list_delegate);
+  explicit PopupBubbleContentsView(NotificationChangeObserver* observer);
 
   void Update(const NotificationList::PopupNotifications& popup_notifications);
 
   size_t NumMessageViews() const {
     return content_->child_count();
   }
 
  private:
-  NotificationList::Delegate* list_delegate_;
+  NotificationChangeObserver* observer_; // Weak reference.
   views::View* content_;
 
   DISALLOW_COPY_AND_ASSIGN(PopupBubbleContentsView);
 };
 
 PopupBubbleContentsView::PopupBubbleContentsView(
-    NotificationList::Delegate* list_delegate)
-    : list_delegate_(list_delegate) {
+    NotificationChangeObserver* observer)
+    : observer_(observer) {
   SetLayoutManager(new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 1));
 
   content_ = new views::View;
   content_->SetLayoutManager(
       new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 1));
   AddChildView(content_);
 
   if (get_use_acceleration_when_possible()) {
     content_->SetPaintToLayer(true);
     content_->SetFillsBoundsOpaquely(false);
     content_->layer()->SetMasksToBounds(true);
   }
 }
 
 void PopupBubbleContentsView::Update(
     const NotificationList::PopupNotifications& popup_notifications) {
   content_->RemoveAllChildViews(true);
   for (NotificationList::PopupNotifications::const_iterator iter =
            popup_notifications.begin();
        iter != popup_notifications.end(); ++iter) {
-    content_->AddChildView(NotificationView::Create(*(*iter), list_delegate_));
+    // NotificationViews are expanded by default here because MessagePopupBubble
+    // 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.
+    content_->AddChildView(NotificationView::Create(*(*iter), observer_, true));
   }
   content_->SizeToPreferredSize();
   content_->InvalidateLayout();
   Layout();
   if (GetWidget())
     GetWidget()->GetRootView()->SchedulePaint();
 }
 
 // The timer to call OnAutoClose for |notification|.
 class MessagePopupBubble::AutocloseTimer {
@@ skipping 33 matching lines @@
                           base::Unretained(bubble_), id_));
 }
 
 void MessagePopupBubble::AutocloseTimer::Suspend() {
   base::TimeDelta passed = base::Time::Now() - start_time_;
   delay_ = std::max(base::TimeDelta(), delay_ - passed);
   timer_.Reset();
 }
 
 // MessagePopupBubble
-MessagePopupBubble::MessagePopupBubble(NotificationList::Delegate* delegate)
-    : MessageBubbleBase(delegate),
+MessagePopupBubble::MessagePopupBubble(MessageCenter* message_center)
+    : MessageBubbleBase(message_center),
       contents_view_(NULL) {
 }
 
 MessagePopupBubble::~MessagePopupBubble() {
   STLDeleteContainerPairSecondPointers(autoclose_timers_.begin(),
                                        autoclose_timers_.end());
 }
 
 views::TrayBubbleView::InitParams MessagePopupBubble::GetInitParams(
     views::TrayBubbleView::AnchorAlignment anchor_alignment) {
   views::TrayBubbleView::InitParams init_params =
       GetDefaultInitParams(anchor_alignment);
   init_params.arrow_color = kBackgroundColor;
   init_params.close_on_deactivate = false;
   return init_params;
 }
 
 void MessagePopupBubble::InitializeContents(
     views::TrayBubbleView* new_bubble_view) {
   set_bubble_view(new_bubble_view);
-  contents_view_ = new PopupBubbleContentsView(list_delegate());
+  contents_view_ = new PopupBubbleContentsView(message_center());
   bubble_view()->AddChildView(contents_view_);
   UpdateBubbleView();
 }
 
 void MessagePopupBubble::OnBubbleViewDestroyed() {
   contents_view_ = NULL;
 }
 
 void MessagePopupBubble::UpdateBubbleView() {
   NotificationList::PopupNotifications popups =
-      list_delegate()->GetNotificationList()->GetPopupNotifications();
+      message_center()->notification_list()->GetPopupNotifications();
 
   if (popups.size() == 0) {
     if (bubble_view())
       bubble_view()->delegate()->HideBubble(bubble_view());  // deletes |this|
     return;
   }
 
   contents_view_->Update(popups);
   bubble_view()->Show();
   bubble_view()->UpdateBubble();
@@ skipping 33 matching lines @@
 
 void MessagePopupBubble::OnMouseExitedView() {
   for (std::map<std::string, AutocloseTimer*>::iterator iter =
            autoclose_timers_.begin(); iter != autoclose_timers_.end(); ++iter) {
     iter->second->Start();
   }
 }
 
 void MessagePopupBubble::OnAutoClose(const std::string& id) {
   DeleteTimer(id);
-  list_delegate()->GetNotificationList()->MarkSinglePopupAsShown(id, false);
+  message_center()->notification_list()->MarkSinglePopupAsShown(id, false);
   UpdateBubbleView();
 }
 
 void MessagePopupBubble::DeleteTimer(const std::string& id) {
   std::map<std::string, AutocloseTimer*>::iterator iter =
       autoclose_timers_.find(id);
   if (iter != autoclose_timers_.end()) {
     scoped_ptr<AutocloseTimer> release_timer(iter->second);
     autoclose_timers_.erase(iter);
   }
 }
 
 size_t MessagePopupBubble::NumMessageViewsForTest() const {
   return contents_view_->NumMessageViews();
 }
 
 }  // namespace message_center