| Index: ui/views/corewm/focus_controller.cc
|
| diff --git a/ui/views/corewm/focus_controller.cc b/ui/views/corewm/focus_controller.cc
|
| index 8c05ac26f324454016ad66d05224304424f5c2c8..c92428a735ad87a37c8178829a8363d6bc989e1c 100644
|
| --- a/ui/views/corewm/focus_controller.cc
|
| +++ b/ui/views/corewm/focus_controller.cc
|
| @@ -12,6 +12,7 @@
|
| #include "ui/aura/env.h"
|
| #include "ui/events/event.h"
|
| #include "ui/views/corewm/focus_rules.h"
|
| +#include "ui/views/corewm/transient_window_manager.h"
|
|
|
| namespace views {
|
| namespace corewm {
|
| @@ -24,10 +25,10 @@ void StackTransientParentsBelowModalWindow(aura::Window* window) {
|
| if (window->GetProperty(aura::client::kModalKey) != ui::MODAL_TYPE_WINDOW)
|
| return;
|
|
|
| - aura::Window* transient_parent = window->transient_parent();
|
| + aura::Window* transient_parent = views::corewm::GetTransientParent(window);
|
| while (transient_parent) {
|
| transient_parent->parent()->StackChildAtTop(transient_parent);
|
| - transient_parent = transient_parent->transient_parent();
|
| + transient_parent = views::corewm::GetTransientParent(transient_parent);
|
| }
|
| }
|
|
|
| @@ -36,7 +37,7 @@ void StackWindowLayerAbove(aura::Window* window, aura::Window* relative_to) {
|
| // Stack |window| above the last transient child of |relative_to| that shares
|
| // the same parent.
|
| const aura::Window::Windows& window_transients(
|
| - relative_to->transient_children());
|
| + GetTransientChildren(relative_to));
|
| for (aura::Window::Windows::const_iterator i = window_transients.begin();
|
| i != window_transients.end(); ++i) {
|
| aura::Window* transient = *i;
|
|
|