| Index: services/ui/ws/display.cc
|
| diff --git a/services/ui/ws/display.cc b/services/ui/ws/display.cc
|
| index eee8a6c7cdfd6c19a8b3eaa1fc69633ffd4fc498..e93c88023faa98ee3d0add72f88614e52ad67e22 100644
|
| --- a/services/ui/ws/display.cc
|
| +++ b/services/ui/ws/display.cc
|
| @@ -270,13 +270,6 @@ ServerWindow* Display::GetRootWindow() {
|
| return root_.get();
|
| }
|
|
|
| -ServerWindow* Display::GetActiveRootWindow() {
|
| - WindowManagerDisplayRoot* display_root = GetActiveWindowManagerDisplayRoot();
|
| - if (display_root)
|
| - return display_root->root();
|
| - return nullptr;
|
| -}
|
| -
|
| void Display::OnAcceleratedWidgetAvailable() {
|
| display_manager()->OnDisplayAcceleratedWidgetAvailable(this);
|
| InitWindowManagerDisplayRoots();
|
| @@ -313,6 +306,13 @@ void Display::OnViewportMetricsChanged(
|
| pair.second->root()->SetBounds(new_bounds);
|
| }
|
|
|
| +ServerWindow* Display::GetActiveRootWindow() {
|
| + WindowManagerDisplayRoot* display_root = GetActiveWindowManagerDisplayRoot();
|
| + if (display_root)
|
| + return display_root->root();
|
| + return nullptr;
|
| +}
|
| +
|
| bool Display::CanHaveActiveChildren(ServerWindow* window) const {
|
| return window && activation_parents_.Contains(window);
|
| }
|
|
|