[mus+ash] Removes WmWindow from ash/shelf and ash/shell

chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc

Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
index a7582988caa445814a8962bd32c5fb25cdd45d15..d0fda1728fc6a7a2a6264da3aee0fd1e5a69bf0d 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
@@ -14,7 +14,6 @@
 #include "ash/shell_port.h"
 #include "ash/strings/grit/ash_strings.h"
 #include "ash/system/tray/system_tray_delegate.h"
-#include "ash/wm_window.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/pattern.h"
 #include "base/strings/string_util.h"
@@ -82,7 +81,7 @@ namespace {
 
 int64_t GetDisplayIDForShelf(ash::Shelf* shelf) {
   display::Display display =
-      shelf->GetWindow()->GetRootWindow()->GetDisplayNearestWindow();
+      display::Screen::GetScreen()->GetDisplayNearestWindow(shelf->GetWindow());
   DCHECK(display.is_valid());
   return display.id();
 }