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

ash/shell/window_watcher.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/shell/window_watcher.h"
 
 #include <utility>
 
 #include "ash/common/shelf/shelf_model.h"
 #include "ash/common/shelf/shelf_widget.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
-#include "ash/display/window_tree_host_manager.h"
 #include "ash/public/cpp/shelf_item.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/shell.h"
 #include "ash/shell/window_watcher_shelf_item_delegate.h"
 #include "ash/wm/window_properties.h"
 #include "ash/wm/window_util.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/display/display.h"
 
@@ skipping 104 matching lines @@
       int index = model->ItemIndexByID(i->first);
       DCHECK_NE(-1, index);
       model->RemoveItemAt(index);
       id_to_window_.erase(i);
       break;
     }
   }
 }
 
 void WindowWatcher::OnDisplayAdded(const display::Display& new_display) {
-  aura::Window* root = Shell::GetInstance()
-                           ->window_tree_host_manager()
-                           ->GetRootWindowForDisplayId(new_display.id());
-  workspace_window_watcher_->RootWindowAdded(root);
+  WmWindow* root = WmShell::Get()->GetRootWindowForDisplayId(new_display.id());
+  workspace_window_watcher_->RootWindowAdded(root->aura_window());
 }
 
 void WindowWatcher::OnDisplayRemoved(const display::Display& old_display) {
   // All windows in the display has already been removed, so no need to
   // remove observers.
 }
 
 void WindowWatcher::OnDisplayMetricsChanged(const display::Display&, uint32_t) {
 }
 
 }  // namespace shell
 }  // namespace ash