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

chrome/browser/chromeos/ui/accessibility_cursor_ring_layer.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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 {
 
 namespace {
 
 // The number of pixels in the color gradient that fades to transparent.
 const int kGradientWidth = 8;
 
 // The radius of the ring in pixels.
@@ skipping 15 matching lines @@
 
 void AccessibilityCursorRingLayer::Set(const gfx::Point& location) {
   location_ = location;
 
   gfx::Rect bounds = gfx::Rect(location.x(), location.y(), 0, 0);
   int inset = kGradientWidth + kCursorRingRadius + kLayerMargin;
   bounds.Inset(-inset, -inset, -inset, -inset);
 
   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);
 }
 
 void AccessibilityCursorRingLayer::OnPaintLayer(
     const ui::PaintContext& context) {
   ui::PaintRecorder recorder(context, layer()->size());
 
   cc::PaintFlags flags;
   flags.setAntiAlias(true);
   flags.setStyle(cc::PaintFlags::kStroke_Style);
   flags.setStrokeWidth(2);
 
   gfx::Rect r = layer()->bounds();
   r.Offset(-r.OffsetFromOrigin());
   r.Inset(kLayerMargin, kLayerMargin, kLayerMargin, kLayerMargin);
   const int w = kGradientWidth;
   for (int i = 0; i < w; ++i) {
     flags.setColor(
         SkColorSetARGBMacro(255 * (i) * (i) / (w * w), red_, green_, blue_));
     SkPath path;
     path.addOval(SkRect::MakeXYWH(r.x(), r.y(), r.width(), r.height()));
     r.Inset(1, 1, 1, 1);
     recorder.canvas()->DrawPath(path, flags);
   }
 }
 
 }  // namespace chromeos