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

ash/wm/drag_window_controller.cc

 // Copyright (c) 2012 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 "ash/wm/drag_window_controller.h"
 
 #include <algorithm>
 
-#include "ash/display/window_tree_host_manager.h"
+#include "ash/common/wm_shell.h"
+#include "ash/common/wm_window.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/shell.h"
 #include "ash/wm/window_util.h"
 #include "base/memory/ptr_util.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/base/hit_test.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_tree_owner.h"
 #include "ui/compositor/paint_context.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
+#include "ui/display/display.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/wm/core/coordinate_conversion.h"
 #include "ui/wm/core/shadow_types.h"
 #include "ui/wm/core/window_util.h"
 
 namespace ash {
 
 // This keeps track of the drag window's state. It creates/destroys/updates
 // bounds and opacity based on the current bounds.
 class DragWindowController::DragWindowDetails : public aura::WindowDelegate {
  public:
   DragWindowDetails(const display::Display& display,
                     aura::Window* original_window)
-      : root_window_(Shell::GetInstance()
-                         ->window_tree_host_manager()
-                         ->GetRootWindowForDisplayId(display.id())) {}
+      : root_window_(WmShell::Get()
+                         ->GetRootWindowForDisplayId(display.id())
+                         ->aura_window()) {}
 
   ~DragWindowDetails() override {
     delete drag_window_;
     DCHECK(!drag_window_);
   }
 
   void Update(aura::Window* original_window,
               const gfx::Rect& bounds_in_screen,
               const gfx::Point& drag_location_in_screen) {
     gfx::Rect root_bounds_in_screen = root_window_->GetBoundsInScreen();
@@ skipping 192 matching lines @@
       layers.pop_back();
       if (layer->delegate())
         layer->delegate()->OnPaintLayer(context);
       for (auto* child : layer->children())
         layers.push_back(child);
     }
   }
 }
 
 }  // namespace ash