Changes launcher so that when animating hidden the background doesn't

ash/wm/window_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/window_animations.h"
 
 #include <math.h>
 
 #include <algorithm>
 #include <vector>
@@ skipping 612 matching lines @@
  public:
   // Observes |window| for destruction, but does not take ownership.
   // Takes ownership of |layer| and its child layers.
   CrossFadeObserver(Window* window, Layer* layer)
       : window_(window),
         layer_(layer) {
     window_->AddObserver(this);
     layer_->GetCompositor()->AddObserver(this);
   }
   virtual ~CrossFadeObserver() {
-    Cleanup();
+    window_->RemoveObserver(this);
+    window_ = NULL;
+    layer_->GetCompositor()->RemoveObserver(this);
+    wm::DeepDeleteLayers(layer_);
+    layer_ = NULL;
   }
 
   // ui::CompositorObserver overrides:
   virtual void OnCompositingDidCommit(ui::Compositor* compositor) OVERRIDE {
   }
   virtual void OnCompositingWillStart(ui::Compositor* compositor) OVERRIDE {
   }
   virtual void OnCompositingStarted(ui::Compositor* compositor) OVERRIDE {
   }
   virtual void OnCompositingEnded(ui::Compositor* compositor) OVERRIDE {
   }
   virtual void OnCompositingAborted(ui::Compositor* compositor) OVERRIDE {
-    // Something went wrong with compositing and our layers are now invalid.
-    if (layer_)
-      layer_->GetAnimator()->StopAnimating();
-    // Delete is scheduled in OnImplicitAnimationsCompleted().
-    Cleanup();
+    // Triggers OnImplicitAnimationsCompleted() to be called and deletes us.
+    layer_->GetAnimator()->StopAnimating();
   }
 
   // aura::WindowObserver overrides:
   virtual void OnWindowDestroying(Window* window) OVERRIDE {
-    if (layer_)
-      layer_->GetAnimator()->StopAnimating();
-    // Delete is scheduled in OnImplicitAnimationsCompleted().
-    Cleanup();
+    // Triggers OnImplicitAnimationsCompleted() to be called and deletes us.
+    layer_->GetAnimator()->StopAnimating();
   }
 
   // ui::ImplicitAnimationObserver overrides:
   virtual void OnImplicitAnimationsCompleted() OVERRIDE {
     delete this;
   }
 
  private:
-  // Can be called multiple times if the window is closed or the compositor
-  // fails in the middle of the animation.
-  void Cleanup() {
-    if (window_) {
-      window_->RemoveObserver(this);
-      window_ = NULL;
-    }
-    if (layer_) {
-      layer_->GetCompositor()->RemoveObserver(this);
-      wm::DeepDeleteLayers(layer_);
-      layer_ = NULL;
-    }
-  }
-
   Window* window_;  // not owned
   Layer* layer_;  // owned
 
   DISALLOW_COPY_AND_ASSIGN(CrossFadeObserver);
 };
 
 }  // namespace
 }  // namespace internal
 
 namespace {
 
+// Duration of cross fades when workspace2 is enabled.
+const int kWorkspaceCrossFadeDurationMs = 333;
+
+// Scales for workspaces above/below current workspace.
+const float kWorkspaceScaleAbove = 1.1f;
+const float kWorkspaceScaleBelow = .9f;
+
 // TODO: leaving in for now since Nicholas wants to play with this, remove if we
 // leave it at 0.
 const int kPauseTimeMS = 0;
 
-// Duration of cross fades when workspace2 is enabled.
-const int kWorkspaceCrossFadeDurationMs = 333;
+}  // namespace
 
 // Amount of time for animating a workspace in or out.
 const int kWorkspaceSwitchTimeMS = 333 + kPauseTimeMS;
 
-// Scales for workspaces above/below current workspace.
-const float kWorkspaceScaleAbove = 1.1f;
-const float kWorkspaceScaleBelow = .9f;
+namespace {
 
 enum WorkspaceScaleType {
   WORKSPACE_SCALE_ABOVE,
   WORKSPACE_SCALE_BELOW,
 };
 
 void ApplyWorkspaceScale(ui::Layer* layer, WorkspaceScaleType type) {
   const float scale = type == WORKSPACE_SCALE_ABOVE ? kWorkspaceScaleAbove :
       kWorkspaceScaleBelow;
   ui::Transform transform;
@@ skipping 332 matching lines @@
     return AnimateShowWindow(window);
   } else {
     // Don't start hiding the window again if it's already being hidden.
     return window->layer()->GetTargetOpacity() != 0.0f &&
         AnimateHideWindow(window);
   }
 }
 
 }  // namespace internal
 }  // namespace ash