| 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());
|
| + }
|
| }
|
| }
|
|
|
|
|