| Index: ui/aura_shell/stacking_controller.cc
|
| ===================================================================
|
| --- ui/aura_shell/stacking_controller.cc (revision 110305)
|
| +++ ui/aura_shell/stacking_controller.cc (working copy)
|
| @@ -21,7 +21,8 @@
|
| // Returns true if children of |window| can be activated.
|
| bool SupportsChildActivation(aura::Window* window) {
|
| return window->id() == kShellWindowId_DefaultContainer ||
|
| - window->id() == kShellWindowId_AlwaysOnTopContainer;
|
| + window->id() == kShellWindowId_AlwaysOnTopContainer ||
|
| + window->id() == kShellWindowId_TransientContainer;
|
| }
|
|
|
| } // namespace
|
| @@ -68,6 +69,10 @@
|
| switch (window->type()) {
|
| case aura::WINDOW_TYPE_NORMAL:
|
| case aura::WINDOW_TYPE_POPUP:
|
| + if (window->transient_parent()) {
|
| + parent = GetContainer(internal::kShellWindowId_TransientContainer);
|
| + break;
|
| + }
|
| parent = always_on_top_controller_->GetContainer(window);
|
| break;
|
| case aura::WINDOW_TYPE_MENU:
|
|
|