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

Unified Diff: ui/views/corewm/focus_controller.cc

Issue 180273025: Keep dedicated layers for hiding animation (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix OnWnidowDestroying Created 6 years, 10 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 | « no previous file | ui/views/corewm/window_animations.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/corewm/focus_controller.cc
diff --git a/ui/views/corewm/focus_controller.cc b/ui/views/corewm/focus_controller.cc
index a3107a19b4be27e51a4b550257f06786c327f4be..35b11705d509b4b755c021d1a3444e1665751bb8 100644
--- a/ui/views/corewm/focus_controller.cc
+++ b/ui/views/corewm/focus_controller.cc
@@ -13,6 +13,7 @@
#include "ui/aura/window_tracker.h"
#include "ui/events/event.h"
#include "ui/views/corewm/focus_rules.h"
+#include "ui/views/corewm/window_animations.h"
#include "ui/views/corewm/window_util.h"
namespace views {
@@ -46,8 +47,11 @@ void StackWindowLayerAbove(aura::Window* window, aura::Window* relative_to) {
relative_to = transient;
}
if (window != relative_to) {
- window->layer()->parent()->StackAbove(window->layer(),
- relative_to->layer());
+ ui::Layer* hiding_layer = DetachHidingAnimationLayer(window);
+ if (hiding_layer) {
+ window->layer()->parent()->StackAbove(hiding_layer,
+ relative_to->layer());
+ }
}
}
« no previous file with comments | « no previous file | ui/views/corewm/window_animations.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698