Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2958)

Unified Diff: ash/wm/window_animations.cc

Issue 10874064: Fixes crash introduced @ 153047 (you can hit crash by maximizing a (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/wm/window_animations.h ('k') | ash/wm/window_animations_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/window_animations.cc
diff --git a/ash/wm/window_animations.cc b/ash/wm/window_animations.cc
index 6f1bca355de533afdf3b98259225c53ec14420f3..0b4a24a4075447d3f59af6a73c7255574af41b6b 100644
--- a/ash/wm/window_animations.cc
+++ b/ash/wm/window_animations.cc
@@ -49,7 +49,6 @@ namespace internal {
namespace {
const float kWindowAnimation_Vertical_TranslateY = 15.f;
-bool delayed_old_layer_deletion_in_cross_fade_for_test_ = false;
}
DEFINE_WINDOW_PROPERTY_KEY(WindowVisibilityAnimationType,
@@ -663,13 +662,7 @@ class CrossFadeObserver : public ui::CompositorObserver,
// ui::ImplicitAnimationObserver overrides:
virtual void OnImplicitAnimationsCompleted() OVERRIDE {
- // ImplicitAnimationObserver's base class uses the object after
- // calling this function, so we cannot delete |this|. The |layer_|
- // may be gone by the next message loop run when shutting down, so
- // clean them up now.
- if (!delayed_old_layer_deletion_in_cross_fade_for_test_)
- Cleanup();
- MessageLoop::current()->DeleteSoon(FROM_HERE, this);
+ delete this;
}
private:
@@ -850,9 +843,5 @@ bool AnimateOnChildWindowVisibilityChanged(aura::Window* window, bool visible) {
}
}
-void SetDelayedOldLayerDeletionInCrossFadeForTest(bool value) {
- delayed_old_layer_deletion_in_cross_fade_for_test_ = value;
-}
-
} // namespace internal
} // namespace ash
« no previous file with comments | « ash/wm/window_animations.h ('k') | ash/wm/window_animations_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698