| Index: ash/common/wm/fullscreen_window_finder.cc
|
| diff --git a/ash/common/wm/fullscreen_window_finder.cc b/ash/common/wm/fullscreen_window_finder.cc
|
| index 069ad2eb8756bd635361c00aeb7735e8b2db92b4..5ae2ac967420b31a5c48d6c22a69af775f42b67b 100644
|
| --- a/ash/common/wm/fullscreen_window_finder.cc
|
| +++ b/ash/common/wm/fullscreen_window_finder.cc
|
| @@ -7,8 +7,8 @@
|
| #include "ash/common/shell_window_ids.h"
|
| #include "ash/common/wm/switchable_windows.h"
|
| #include "ash/common/wm/window_state.h"
|
| -#include "ash/common/wm/wm_globals.h"
|
| -#include "ash/common/wm/wm_window.h"
|
| +#include "ash/common/wm_shell.h"
|
| +#include "ash/common/wm_window.h"
|
| #include "ui/compositor/layer.h"
|
|
|
| namespace ash {
|
| @@ -16,7 +16,7 @@ namespace wm {
|
|
|
| WmWindow* GetWindowForFullscreenMode(WmWindow* context) {
|
| WmWindow* topmost_window = nullptr;
|
| - WmWindow* active_window = context->GetGlobals()->GetActiveWindow();
|
| + WmWindow* active_window = context->GetShell()->GetActiveWindow();
|
| if (active_window &&
|
| active_window->GetRootWindow() == context->GetRootWindow() &&
|
| IsSwitchableContainer(active_window->GetParent())) {
|
|
|