Do not reuse the old NotificationView in PopupCollection.

The current code just reuse existing popup widgets, but the contents
might be updated, like image loads. We should recreate every views
and set to the widget.

We should reuse the widgets, beucase closing/opening widgets will
involve animations like fade-out/fade-in.

BUG=180386
TEST=Open multiple issues and make sure images appear


Review URL: https://chromiumcodereview.appspot.com/12521004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@186630 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 12 insertions, 4 deletions

diff --git a/ui/message_center/views/message_popup_collection.cc b/ui/message_center/views/message_popup_collection.cc
index 17fa29a1..f00308d 100644
--- a/ui/message_center/views/message_popup_collection.cc
+++ b/ui/message_center/views/message_popup_collection.cc
@@ -24,7 +24,6 @@ namespace message_center {
 class ToastContentsView : public views::WidgetDelegateView {
  public:
   ToastContentsView(const Notification* notification,
-                    MessageView* view,
                     MessagePopupCollection* collection)
       : collection_(collection) {
     DCHECK(collection_);
@@ -35,7 +34,6 @@ class ToastContentsView : public views::WidgetDelegateView {
     // the whole toast seems to slide although the actual bound of the widget
     // remains. This is hacky but easier to keep the consistency.
     set_background(views::Background::CreateSolidBackground(0, 0, 0, 0));
-    AddChildView(view);
 
     int seconds = kAutocloseDefaultDelaySeconds;
     if (notification->priority() > DEFAULT_PRIORITY)
@@ -59,6 +57,12 @@ class ToastContentsView : public views::WidgetDelegateView {
     return widget;
   }
 
+  void SetContents(MessageView* view) {
+    RemoveAllChildViews(true);
+    AddChildView(view);
+    Layout();
+  }
+
   void SuspendTimer() {
     timer_.Reset();
   }
@@ -149,12 +153,16 @@ void MessagePopupCollection::UpdatePopups() {
            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_);
     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 {
-      MessageView* view = NotificationView::Create(*(*iter), list_delegate_);
-      ToastContentsView* toast = new ToastContentsView(*iter, view, this);
+      ToastContentsView* toast = new ToastContentsView(*iter, this);
+      toast->SetContents(view);
       widget = toast->CreateWidget(context_);
       widget->AddObserver(this);
       toast->StartTimer();