[mus+ash] Removes WmWindow from RootWindowcontroller implementation

ash/shelf/shelf_window_targeter.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 "ash/shelf/shelf_window_targeter.h"
 
 #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 {
 
 namespace {
 
 gfx::Insets GetInsetsForAlignment(int distance, ShelfAlignment alignment) {
   if (alignment == SHELF_ALIGNMENT_LEFT)
     return gfx::Insets(0, 0, 0, distance);
   if (alignment == SHELF_ALIGNMENT_RIGHT)
     return gfx::Insets(0, distance, 0, 0);
   return gfx::Insets(distance, 0, 0, 0);
 }
 
 }  // 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);
 }
 
 ShelfWindowTargeter::~ShelfWindowTargeter() {
   // Ensure that the observers were removed and the shelf pointer was cleared.
   DCHECK(!shelf_);
 }
 
 void ShelfWindowTargeter::OnWindowDestroying(aura::Window* window) {
   window->RemoveObserver(this);
@@ skipping 15 matching lines @@
     // while hidden.
     touch_insets = GetInsetsForAlignment(-kWorkspaceAreaAutoHideInset,
                                          shelf_->alignment());
   }
 
   set_mouse_extend(mouse_insets);
   set_touch_extend(touch_insets);
 }
 
 }  // namespace ash