Only slide-down animation in message center too.

ui/message_center/views/message_center_view.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_center_view.h"
 
 #include <list>
 #include <map>
 
 #include "base/memory/weak_ptr.h"
@@ skipping 468 matching lines @@
   virtual void ResetRepositionSession() OVERRIDE;
   virtual void ClearAllNotifications(
       const gfx::Rect& visible_scroll_rect) OVERRIDE;
 
   // Overridden from views::BoundsAnimatorObserver.
   virtual void OnBoundsAnimatorProgressed(
       views::BoundsAnimator* animator) OVERRIDE;
   virtual void OnBoundsAnimatorDone(views::BoundsAnimator* animator) OVERRIDE;
 
  private:
+  // Returns the actual index for child of |index|.
+  // RichMessageListView allows to slide down upper notifications, which means
+  // that the upper ones should come above the lower ones. To achieve this,
+  // inversed order is adopted. The top most notification is the last child,
+  // and the bottom most notification is the first child.
   int GetActualIndex(int index);
   bool IsValidChild(views::View* child);
   void DoUpdateIfPossible();
 
   // Schedules animation for a child to the specified position.
   void AnimateChild(views::View* child, int top, int height);
 
   // Animate clearing one notification.
   void AnimateClearingOneNotification();
 
@@ skipping 42 matching lines @@
 
 void RichMessageListView::Layout() {
   if (animator_.get())
     return;
 
   gfx::Rect child_area = GetContentsBounds();
   int top = child_area.y();
   int between_items =
       kMarginBetweenItems - MessageView::GetShadowInsets().bottom();
 
-  for (int i = 0; i < child_count(); ++i) {
+  for (int i = child_count() - 1; i >= 0; --i) {
     views::View* child = child_at(i);
     if (!child->visible())
       continue;
     int height = child->GetHeightForWidth(child_area.width());
     child->SetBounds(child_area.x(), top, child_area.width(), height);
     top += height + between_items;
   }
 }
 
 void RichMessageListView::AddNotificationAt(views::View* view, int i) {
-  AddChildViewAt(view, GetActualIndex(i));
+  // Increment by 1 because the default behavior of AddChildViewAt() is to
+  // insert before the specified index.
+  AddChildViewAt(view, GetActualIndex(i) + 1);
   if (GetContentsBounds().IsEmpty())
     return;
 
   adding_views_.insert(view);
   DoUpdateIfPossible();
 }
 
 void RichMessageListView::RemoveNotificationAt(int i) {
   views::View* child = child_at(GetActualIndex(i));
   if (GetContentsBounds().IsEmpty()) {
     delete child;
   } else {
     if (child->layer()) {
       deleting_views_.insert(child);
     } else {
       if (animator_.get())
         animator_->StopAnimatingView(child);
       delete child;
     }
     DoUpdateIfPossible();
   }
 }
 
 void RichMessageListView::UpdateNotificationAt(views::View* view, int i) {
-  views::View* child = child_at(GetActualIndex(i));
+  int actual_index = GetActualIndex(i);
+  views::View* child = child_at(actual_index);
   if (animator_.get())
     animator_->StopAnimatingView(child);
   gfx::Rect old_bounds = child->bounds();
   if (deleting_views_.find(child) != deleting_views_.end())
     deleting_views_.erase(child);
   if (deleted_when_done_.find(child) != deleted_when_done_.end())
     deleted_when_done_.erase(child);
   delete child;
-  AddChildViewAt(view, i);
+  AddChildViewAt(view, actual_index);
   view->SetBounds(old_bounds.x(), old_bounds.y(), old_bounds.width(),
                   view->GetHeightForWidth(old_bounds.width()));
   DoUpdateIfPossible();
 }
 
 gfx::Size RichMessageListView::GetPreferredSize() {
   int width = 0;
   for (int i = 0; i < child_count(); i++) {
     views::View* child = child_at(i);
     if (IsValidChild(child))
@@ skipping 83 matching lines @@
   if (has_deferred_task_) {
     has_deferred_task_ = false;
     DoUpdateIfPossible();
   }
 
   if (GetWidget())
     GetWidget()->SynthesizeMouseMoveEvent();
 }
 
 int RichMessageListView::GetActualIndex(int index) {
-  for (int i = 0; i < child_count() && i <= index; ++i)
-    index += IsValidChild(child_at(i)) ? 0 : 1;
-  return std::min(index, child_count());
+  // As is written in the comment in the declaration, this method
+  // returns actual index for the |index|-th valid child from the end.
+  int actual_index = child_count() - 1;
+  // Skips the invalid children at last.
+  for (; actual_index > 0; --actual_index) {
+    if (IsValidChild(child_at(actual_index)))
+      break;
+  }
+  // Find the |index|-th valid child from the end.
+  for (; actual_index >= 0 && index > 0; --actual_index) {
+    index -= IsValidChild(child_at(actual_index)) ? 1 : 0;
+  }
+  return actual_index;
 }
 
 bool RichMessageListView::IsValidChild(views::View* child) {
   return child->visible() &&
       deleting_views_.find(child) == deleting_views_.end() &&
       deleted_when_done_.find(child) == deleted_when_done_.end();
 }
 
 void RichMessageListView::DoUpdateIfPossible() {
   gfx::Rect child_area = GetContentsBounds();
   if (child_area.IsEmpty())
     return;
 
   if (animator_.get() && animator_->IsAnimating()) {
     has_deferred_task_ = true;
     return;
   }
 
   if (!animator_.get()) {
     animator_.reset(new views::BoundsAnimator(this));
     animator_->AddObserver(this);
   }
 
   if (!clearing_all_views_.empty()) {
     AnimateClearingOneNotification();
     return;
   }
 
-  int between_items =
-      kMarginBetweenItems - MessageView::GetShadowInsets().bottom();
-  int width = child_area.width();
-  views::View* last_child = NULL;
-  for (int i = child_count() - 1; i >= 0; --i) {
+  int first_index = -1;
+  for (int i = 0; i < child_count(); ++i) {
     views::View* child = child_at(i);
-    if (IsValidChild(child)) {
-      last_child = child;
+    if (!IsValidChild(child)) {
+      AnimateChild(child, child->y(), child->height());
+    } else if (child->y() < reposition_top_) {
+      first_index = i;
       break;
     }
   }
-
-  if (!last_child || reposition_top_ < last_child->bounds().y()) {
-    const int initial_top = std::max(reposition_top_, child_area.y());
-    int top = initial_top;
-    for (int i = 0; i < child_count(); ++i) {
+  if (first_index > 0) {
+    int bottom = reposition_top_ + child_at(first_index)->height();
+    int between_items =
+        kMarginBetweenItems - MessageView::GetShadowInsets().bottom();
+    for (int i = first_index; i < child_count(); ++i) {
       views::View* child = child_at(i);
-      if (adding_views_.find(child) == adding_views_.end() &&
-          child->bounds().y() < initial_top) {
-        continue;
-      }
-      int height = child->GetHeightForWidth(width);
-      AnimateChild(child, top, height);
-      if (IsValidChild(child))
-        top += height + between_items;
-    }
-  } else {
-    int bottom = reposition_top_ + last_child->GetHeightForWidth(width);
-    for (int i = child_count() - 1; i >= 0; --i) {
-      views::View* child = child_at(i);
-      int height = child->GetHeightForWidth(child_area.width());
-      AnimateChild(child, bottom - height, height);
-      if (IsValidChild(child))
-        bottom -= height + between_items;
+      AnimateChild(child, bottom - child->height(), child->height());
+      bottom -= child->height() + between_items;
     }
   }
   adding_views_.clear();
   deleting_views_.clear();
 }
 
 void RichMessageListView::AnimateChild(views::View* child,
                                        int top,
                                        int height) {
   gfx::Rect child_area = GetContentsBounds();
@@ skipping 418 matching lines @@
   scroller_->InvalidateLayout();
   PreferredSizeChanged();
   Layout();
 }
 
 void MessageCenterView::SetNotificationViewForTest(views::View* view) {
   message_list_view_->AddNotificationAt(view, 0);
 }
 
 }  // namespace message_center