Make RecreateLayer() order the old layer above the new layer

ash/system/tray/system_tray_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 "ash/system/tray/system_tray_bubble.h"
 
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/system_tray_item.h"
@@ skipping 149 matching lines @@
         base::TimeDelta::FromMilliseconds(kSwipeDelayMS);
     scoped_layer.reset(bubble_view_->RecreateLayer());
     // Keep the reference to layer as we need it after releasing it.
     ui::Layer* layer = scoped_layer.get();
     DCHECK(layer);
     layer->SuppressPaint();
 
     // When transitioning from detailed view to default view, animate the
     // existing view (slide out towards the right).
     if (bubble_type == BUBBLE_TYPE_DEFAULT) {
-      // Make sure the old view is visibile over the new view during the
-      // animation.
-      layer->parent()->StackAbove(layer, bubble_view_->layer());
       ui::ScopedLayerAnimationSettings settings(layer->GetAnimator());
       settings.AddObserver(
           new AnimationObserverDeleteLayer(scoped_layer.release()));
       settings.SetTransitionDuration(swipe_duration);
       settings.SetTweenType(ui::Tween::EASE_OUT);
       gfx::Transform transform;
       transform.Translate(layer->bounds().width(), 0.0);
       layer->SetTransform(transform);
     }
 
@@ skipping 40 matching lines @@
   // Make sure that the bubble is large enough for the default view.
   if (bubble_type_ == BUBBLE_TYPE_DEFAULT) {
     bubble_view_->SetMaxHeight(0);  // Clear max height limit.
   }
 
   if (scoped_layer) {
     // When transitioning from default view to detailed view, animate the new
     // view (slide in from the right).
     if (bubble_type == BUBBLE_TYPE_DETAILED) {
       ui::Layer* new_layer = bubble_view_->layer();
+
+      // Make sure the new layer is stacked above the old layer during the
+      // animation.
+      new_layer->parent()->StackAbove(new_layer, scoped_layer.get());
+
       gfx::Rect bounds = new_layer->bounds();
       gfx::Transform transform;
       transform.Translate(bounds.width(), 0.0);
       new_layer->SetTransform(transform);
       {
         ui::ScopedLayerAnimationSettings settings(new_layer->GetAnimator());
         settings.AddObserver(
             new AnimationObserverDeleteLayer(scoped_layer.release()));
         settings.SetTransitionDuration(
             base::TimeDelta::FromMilliseconds(kSwipeDelayMS));
@@ skipping 119 matching lines @@
     // For default view, draw bottom border for each item, except the last
     // 2 items, which are the bottom header row and the one just above it.
     bubble_view_->AddChildView(new TrayPopupItemContainer(
         item_views[i], is_default_bubble,
         is_default_bubble && (i < item_views.size() - 2)));
   }
 }
 
 }  // namespace internal
 }  // namespace ash