| Index: ui/wm/core/focus_controller.cc
|
| diff --git a/ui/wm/core/focus_controller.cc b/ui/wm/core/focus_controller.cc
|
| index 197e04ac120363379c6510cf60c765320a4ef01f..c4e67cf6d072debd8da28adb34fb598b7de1ed4e 100644
|
| --- a/ui/wm/core/focus_controller.cc
|
| +++ b/ui/wm/core/focus_controller.cc
|
| @@ -15,8 +15,7 @@
|
| #include "ui/wm/core/focus_rules.h"
|
| #include "ui/wm/core/window_util.h"
|
|
|
| -namespace views {
|
| -namespace corewm {
|
| +namespace wm {
|
| namespace {
|
|
|
| // When a modal window is activated, we bring its entire transient parent chain
|
| @@ -26,10 +25,10 @@ void StackTransientParentsBelowModalWindow(aura::Window* window) {
|
| if (window->GetProperty(aura::client::kModalKey) != ui::MODAL_TYPE_WINDOW)
|
| return;
|
|
|
| - aura::Window* transient_parent = views::corewm::GetTransientParent(window);
|
| + aura::Window* transient_parent = wm::GetTransientParent(window);
|
| while (transient_parent) {
|
| transient_parent->parent()->StackChildAtTop(transient_parent);
|
| - transient_parent = views::corewm::GetTransientParent(transient_parent);
|
| + transient_parent = wm::GetTransientParent(transient_parent);
|
| }
|
| }
|
|
|
| @@ -375,5 +374,4 @@ void FocusController::WindowFocusedFromInputEvent(aura::Window* window) {
|
| FocusWindow(window);
|
| }
|
|
|
| -} // namespace corewm
|
| -} // namespace views
|
| +} // namespace wm
|
|
|