Merge "cros: Fix unlock crash with multi-display"

ash/wm/session_state_animator_impl.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/wm/session_state_animator_impl.h"
 
 #include <vector>
 
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/shell.h"
 #include "ash/wm/wm_window_animations.h"
+#include "base/barrier_closure.h"
 #include "base/memory/ptr_util.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/compositor/layer_animation_observer.h"
 #include "ui/compositor/layer_animation_sequence.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 namespace {
@@ skipping 519 matching lines @@
   }
 }
 
 void SessionStateAnimatorImpl::StartAnimationWithCallback(
     int container_mask,
     AnimationType type,
     AnimationSpeed speed,
     base::Closure callback) {
   aura::Window::Windows containers;
   GetContainers(container_mask, &containers);
+  base::Closure animation_done_closure =
+      base::BarrierClosure(containers.size(), callback);
   for (aura::Window::Windows::const_iterator it = containers.begin();
        it != containers.end(); ++it) {
     ui::LayerAnimationObserver* observer =
-        new CallbackAnimationObserver(callback);
+        new CallbackAnimationObserver(animation_done_closure);
     RunAnimationForWindow(*it, type, speed, observer);
   }
 }
 
 SessionStateAnimator::AnimationSequence*
 SessionStateAnimatorImpl::BeginAnimationSequence(base::Closure callback) {
   return new AnimationSequence(this, callback);
 }
 
 bool SessionStateAnimatorImpl::IsWallpaperHidden() const {
@@ skipping 87 matching lines @@
                                                  gfx::Tween::EASE_IN, observer);
       break;
     case ANIMATION_UNDO_GRAYSCALE_BRIGHTNESS:
       StartGrayscaleBrightnessAnimationForWindow(
           window, 0.0, duration, gfx::Tween::EASE_IN_OUT, observer);
       break;
   }
 }
 
 }  // namespace ash