[mus+ash] Removes WmWindow from RootWindowcontroller implementation

ash/mus/non_client_frame_controller.cc

Index: ash/mus/non_client_frame_controller.cc
diff --git a/ash/mus/non_client_frame_controller.cc b/ash/mus/non_client_frame_controller.cc
index 8767bf1457e2b587fb65caebdbb721a20278873b..3e9d1841c156e6d064e645409ac4d4b0da53f6a8 100644
--- a/ash/mus/non_client_frame_controller.cc
+++ b/ash/mus/non_client_frame_controller.cc
@@ -22,7 +22,6 @@
 #include "ash/wm/panels/panel_frame_view.h"
 #include "ash/wm/window_properties.h"
 #include "ash/wm/window_util.h"
-#include "ash/wm_window.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ -40,6 +39,7 @@
 #include "ui/gfx/geometry/vector2d.h"
 #include "ui/views/widget/native_widget_aura.h"
 #include "ui/views/widget/widget.h"
+#include "ui/wm/core/coordinate_conversion.h"
 
 DECLARE_UI_CLASS_PROPERTY_TYPE(ash::mus::NonClientFrameController*);
 
@@ -120,8 +120,8 @@ class ImmersiveFullscreenControllerDelegateMus
     // DCHECK is to ensure when parent changes this code is updated.
     // http://crbug.com/640392.
     DCHECK_EQ(frame_window_->parent(), title_area_window->parent());
-    result.push_back(
-        WmWindow::Get(title_area_window)->ConvertRectToScreen(visible_bounds));
+    ::wm::ConvertRectToScreen(title_area_window, &visible_bounds);
+    result.push_back(visible_bounds);
     return result;
   }
 
@@ -263,8 +263,8 @@ class ClientViewMus : public views::ClientView {
   DISALLOW_COPY_AND_ASSIGN(ClientViewMus);
 };
 
-// Returns the frame insets to use when ShouldUseExtendedHitRegion() returns
-// true.
+// Returns the frame insets to use when ShouldUseExtendedHitRegionForWindow()
+// returns true.
 gfx::Insets GetExtendedHitRegion() {
   return gfx::Insets(kResizeOutsideBoundsSize, kResizeOutsideBoundsSize,
                      kResizeOutsideBoundsSize, kResizeOutsideBoundsSize);
@@ -333,10 +333,9 @@ NonClientFrameController::NonClientFrameController(
   layer->SetColor(SK_ColorTRANSPARENT);
   layer->SetFillsBoundsOpaquely(true);
 
-  WmWindow* wm_window = WmWindow::Get(window_);
   const gfx::Insets extended_hit_region =
-      wm_window->ShouldUseExtendedHitRegion() ? GetExtendedHitRegion()
-                                              : gfx::Insets();
+      wm::ShouldUseExtendedHitRegionForWindow(window_) ? GetExtendedHitRegion()
+                                                       : gfx::Insets();
   window_manager_client_->SetExtendedHitArea(window_, extended_hit_region);
 
   aura::client::GetTransientWindowClient()->AddObserver(this);