[mus+ash] Removes WmWindow from RootWindowcontroller implementation

ash/shelf/shelf_window_targeter.cc

Index: ash/shelf/shelf_window_targeter.cc
diff --git a/ash/shelf/shelf_window_targeter.cc b/ash/shelf/shelf_window_targeter.cc
index eb377a1dd203d3a8f3d69436873260af2da83af1..06836bee2f26aad7dcfa853a2be173de78068e2a 100644
--- a/ash/shelf/shelf_window_targeter.cc
+++ b/ash/shelf/shelf_window_targeter.cc
@@ -7,7 +7,6 @@
 #include "ash/public/cpp/shelf_types.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_constants.h"
-#include "ash/wm_window.h"
 #include "ui/aura/window.h"
 
 namespace ash {
@@ -24,13 +23,11 @@ gfx::Insets GetInsetsForAlignment(int distance, ShelfAlignment alignment) {
 
 }  // namespace
 
-ShelfWindowTargeter::ShelfWindowTargeter(WmWindow* container, Shelf* shelf)
-    : ::wm::EasyResizeWindowTargeter(WmWindow::GetAuraWindow(container),
-                                     gfx::Insets(),
-                                     gfx::Insets()),
+ShelfWindowTargeter::ShelfWindowTargeter(aura::Window* container, Shelf* shelf)
+    : ::wm::EasyResizeWindowTargeter(container, gfx::Insets(), gfx::Insets()),
       shelf_(shelf) {
   WillChangeVisibilityState(shelf_->GetVisibilityState());
-  container->aura_window()->AddObserver(this);
+  container->AddObserver(this);
   shelf_->AddObserver(this);
 }