| Index: services/ui/ws/window_server.cc
|
| diff --git a/services/ui/ws/window_server.cc b/services/ui/ws/window_server.cc
|
| index c1fff169fc9dcddf0c9b6f3360b2167665bafbb2..3a46d4db3178b08b44c7b33ad70d372c6f0da0c3 100644
|
| --- a/services/ui/ws/window_server.cc
|
| +++ b/services/ui/ws/window_server.cc
|
| @@ -42,18 +42,7 @@ bool IsWindowConsideredWindowManagerRoot(const Display* display,
|
|
|
| const WindowManagerDisplayRoot* display_root =
|
| display->GetActiveWindowManagerDisplayRoot();
|
| - if (!display_root)
|
| - return false;
|
| -
|
| - if (window == display_root->root())
|
| - return true;
|
| -
|
| - // If the window manager manually creates displays then there is an extra
|
| - // window, the window supplied via SetDisplayRoot().
|
| - return !display_root->window_manager_state()
|
| - ->window_tree()
|
| - ->automatically_create_display_roots() &&
|
| - window->parent() == display_root->root();
|
| + return display_root && display_root->GetClientVisibileRoot() == window;
|
| }
|
|
|
| } // namespace
|
|
|