[mus+ash] Removes WmWindow from RootWindowcontroller implementation

ash/mus/non_client_frame_controller.cc

 // Copyright 2015 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/mus/non_client_frame_controller.h"
 
 #include <stdint.h>
 
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "ash/ash_constants.h"
 #include "ash/ash_layout_constants.h"
 #include "ash/frame/custom_frame_view_ash.h"
 #include "ash/mus/frame/detached_title_area_renderer.h"
 #include "ash/mus/move_event_handler.h"
 #include "ash/mus/property_util.h"
 #include "ash/mus/window_manager.h"
 #include "ash/mus/window_properties.h"
 #include "ash/shared/immersive_fullscreen_controller_delegate.h"
 #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"
 #include "services/ui/public/interfaces/window_manager.mojom.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/transient_window_client.h"
 #include "ui/aura/mus/property_converter.h"
 #include "ui/aura/mus/property_utils.h"
 #include "ui/aura/mus/window_manager_delegate.h"
 #include "ui/aura/mus/window_port_mus.h"
 #include "ui/aura/window.h"
 #include "ui/base/class_property.h"
 #include "ui/base/hit_test.h"
 #include "ui/compositor/layer.h"
 #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*);
 
 namespace ash {
 namespace mus {
 namespace {
 
 DEFINE_UI_CLASS_PROPERTY_KEY(NonClientFrameController*,
                              kNonClientFrameControllerKey,
                              nullptr);
@@ skipping 60 matching lines @@
     // Clip the bounds of the title area to that of the |frame_window_|.
     gfx::Rect visible_bounds = title_area_window->bounds();
     visible_bounds.Intersect(frame_window_->bounds());
     // The intersection is in the coordinates of |title_area_window|'s parent,
     // convert to be in |title_area_window| and then to screen.
     visible_bounds -= title_area_window->bounds().origin().OffsetFromOrigin();
     // TODO: this needs updating when parent of |title_area_window| is changed,
     // 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;
   }
 
  private:
   void CreateTitleAreaWindow() {
     if (GetTitleAreaWindow())
       return;
 
     // TODO(sky): bounds aren't right here. Need to convert to display.
     gfx::Rect bounds = frame_window_->bounds();
@@ skipping 121 matching lines @@
         frame_controller_->window());
     return false;
   }
 
  private:
   NonClientFrameController* frame_controller_;
 
   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);
 }
 
 }  // namespace
 
 NonClientFrameController::NonClientFrameController(
     aura::Window* parent,
     aura::Window* context,
@@ skipping 48 matching lines @@
 
   // Only the caption draws any content. So the caption has its own layer (see
   // above in WmNativeWidgetAura::CreateNonClientFrameView()). The rest of the
   // region needs to take part in occlusion in the compositor, but not generate
   // any content to draw. So the layer is marked as opaque and to draw
   // solid-color (but the color is transparent, so nothing is actually drawn).
   ui::Layer* layer = widget_->GetNativeWindow()->layer();
   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);
 }
 
 // static
 NonClientFrameController* NonClientFrameController::Get(aura::Window* window) {
   return window->GetProperty(kNonClientFrameControllerKey);
 }
 
@@ skipping 118 matching lines @@
 void NonClientFrameController::OnWillRestackTransientChildAbove(
     aura::Window* parent,
     aura::Window* transient_child) {}
 
 void NonClientFrameController::OnDidRestackTransientChildAbove(
     aura::Window* parent,
     aura::Window* transient_child) {}
 
 }  // namespace mus
 }  // namespace ash