Fix focus loss on partial lock.

ash/wm/workspace/workspace_animations.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/workspace/workspace_animations.h"
 
 #include "ash/ash_switches.h"
+#include "base/bind.h"
+#include "base/callback.h"
 #include "base/command_line.h"
 #include "ui/aura/window.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 
 namespace ash {
 namespace internal {
 
 const int kWorkspaceSwitchTimeMS = 200;
 
@@ skipping 24 matching lines @@
 
 // If |details.duration| is not-empty it is returned, otherwise
 // |kWorkspaceSwitchTimeMS| is returned.
 base::TimeDelta DurationForWorkspaceShowOrHide(
     const WorkspaceAnimationDetails& details) {
   return details.duration == base::TimeDelta() ?
       base::TimeDelta::FromMilliseconds(kWorkspaceSwitchTimeMS) :
       details.duration;
 }
 
+void HideWindow(aura::Window* window) {
+  ui::ScopedLayerAnimationSettings settings(window->layer()->GetAnimator());
+  settings.SetPreemptionStrategy(ui::LayerAnimator::ENQUEUE_NEW_ANIMATION);
+  settings.SetTransitionDuration(base::TimeDelta());
+  window->Hide();
+}
+
 }  // namespace
 
 WorkspaceAnimationDetails::WorkspaceAnimationDetails()
     : direction(WORKSPACE_ANIMATE_UP),
       animate(false),
       animate_opacity(false),
       animate_scale(false),
+      can_be_cancelled(false),
       pause_time_ms(0) {
 }
 
 WorkspaceAnimationDetails::~WorkspaceAnimationDetails() {
 }
 
 void ShowWorkspace(aura::Window* window,
                    const WorkspaceAnimationDetails& details) {
   window->Show();
 
@@ skipping 64 matching lines @@
   settings.SetTransitionDuration(DurationForWorkspaceShowOrHide(details));
   settings.SetTweenType(kWorkspaceTweenType);
   if (details.animate_scale) {
     ApplyWorkspaceScale(window->layer(),
                         details.direction == WORKSPACE_ANIMATE_UP ?
                             WORKSPACE_SCALE_ABOVE : WORKSPACE_SCALE_BELOW);
   } else {
     window->layer()->SetTransform(gfx::Transform());
   }
 
-  // NOTE: Hide() must be before SetOpacity(), else
-  // VisibilityController::UpdateLayerVisibility doesn't pass the false to the
-  // layer so that the layer and window end up out of sync and confused.
-  window->Hide();
+  if (details.can_be_cancelled) {
+    // Window should be hidden only upon animation completion, so that focus
+    // is not lost if animation is cancelled.
+    window->layer()->SetVisible(false);
+  } else {
+    // NOTE: Hide() must be before SetOpacity(), else
+    // VisibilityController::UpdateLayerVisibility doesn't pass the false to the
+    // layer so that the layer and window end up out of sync and confused.
+    window->Hide();
+  }
 
   if (details.animate_opacity)
     window->layer()->SetOpacity(0.0f);
 
+  if (details.can_be_cancelled) {
+    // We need window-Hide() to be called to handle focus loss and other stuff
+    // correctly. However, this animation can be aborted in some cases
+    // (e.g. during lock), and window should only be hidden if animation
+    // completes.
+    base::Closure hide_window_callback = base::Bind(&HideWindow, window);
+    window->layer()->GetAnimator()->SetCompletionCallbackForProperties(
+        hide_window_callback,
+        ui::LayerAnimationElement::VISIBILITY,
+        -1);
+  }
   // After the animation completes snap the transform back to the identity,
   // otherwise any one that asks for screen bounds gets a slightly scaled
   // version.
   settings.SetPreemptionStrategy(ui::LayerAnimator::ENQUEUE_NEW_ANIMATION);
   settings.SetTransitionDuration(base::TimeDelta());
   window->layer()->SetTransform(gfx::Transform());
 }
 
 }  // namespace internal
 }  // namespace ash