WindowTreeHostManager::GetRootWindowForDisplayId -> WmShell::GetRoo...

chrome/browser/chromeos/ui/accessibility_cursor_ring_layer.cc

Index: chrome/browser/chromeos/ui/accessibility_cursor_ring_layer.cc
diff --git a/chrome/browser/chromeos/ui/accessibility_cursor_ring_layer.cc b/chrome/browser/chromeos/ui/accessibility_cursor_ring_layer.cc
index 205403ed669e08fcb9375e0f286148e3598cf92c..252392f77c415108d7688b4305e50a3d2bb24359 100644
--- a/chrome/browser/chromeos/ui/accessibility_cursor_ring_layer.cc
+++ b/chrome/browser/chromeos/ui/accessibility_cursor_ring_layer.cc
@@ -4,15 +4,15 @@
 
 #include "chrome/browser/chromeos/ui/accessibility_cursor_ring_layer.h"
 
+#include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
-#include "ash/display/window_tree_host_manager.h"
-#include "ash/shell.h"
-#include "base/bind.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "ui/aura/window.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/paint_recorder.h"
+#include "ui/display/display.h"
+#include "ui/display/screen.h"
 #include "ui/gfx/canvas.h"
 
 namespace chromeos {
@@ -48,10 +48,9 @@ void AccessibilityCursorRingLayer::Set(const gfx::Point& location) {
 
   display::Display display =
       display::Screen::GetScreen()->GetDisplayMatching(bounds);
-  aura::Window* root_window = ash::Shell::GetInstance()
-                                  ->window_tree_host_manager()
-                                  ->GetRootWindowForDisplayId(display.id());
-  ash::WmWindow* root_wm_window = ash::WmWindow::Get(root_window);
+  ash::WmWindow* root_wm_window =
+      ash::WmShell::Get()->GetRootWindowForDisplayId(display.id());
+  aura::Window* root_window = root_wm_window->aura_window();
   bounds = root_wm_window->ConvertRectFromScreen(bounds);
   CreateOrUpdateLayer(root_window, "AccessibilityCursorRing", bounds);
 }