| Index: ash/wm/window_util.cc | 
| diff --git a/ash/wm/window_util.cc b/ash/wm/window_util.cc | 
| index 70e5d5b26d950ee193bfe4eba8990e433a219569..6f10a915229d95db2063c4c1fa46cce50a23ef2b 100644 | 
| --- a/ash/wm/window_util.cc | 
| +++ b/ash/wm/window_util.cc | 
| @@ -10,12 +10,12 @@ | 
| #include "ash/root_window_controller.h" | 
| #include "ash/shelf/wm_shelf.h" | 
| #include "ash/shell.h" | 
| +#include "ash/shell_port.h" | 
| #include "ash/wm/window_properties.h" | 
| #include "ash/wm/window_state.h" | 
| #include "ash/wm/window_state_aura.h" | 
| #include "ash/wm/wm_event.h" | 
| #include "ash/wm/wm_screen_util.h" | 
| -#include "ash/wm_shell.h" | 
| #include "ash/wm_window.h" | 
| #include "ui/aura/client/aura_constants.h" | 
| #include "ui/aura/client/capture_client.h" | 
| @@ -98,13 +98,13 @@ void PinWindow(aura::Window* window, bool trusted) { | 
| void SetAutoHideShelf(aura::Window* window, bool autohide) { | 
| wm::GetWindowState(window)->set_autohide_shelf_when_maximized_or_fullscreen( | 
| autohide); | 
| -  for (WmWindow* root_window : WmShell::Get()->GetAllRootWindows()) | 
| +  for (WmWindow* root_window : ShellPort::Get()->GetAllRootWindows()) | 
| WmShelf::ForWindow(root_window)->UpdateVisibilityState(); | 
| } | 
|  | 
| bool MoveWindowToDisplay(aura::Window* window, int64_t display_id) { | 
| DCHECK(window); | 
| -  WmWindow* root = WmShell::Get()->GetRootWindowForDisplayId(display_id); | 
| +  WmWindow* root = ShellPort::Get()->GetRootWindowForDisplayId(display_id); | 
| return root && MoveWindowToRoot(window, root->aura_window()); | 
| } | 
|  | 
|  |