Move two utility functions from ash/screen_util.h to ui/wm/core/coordinate_conversion.h

ash/common/wm_window.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/common/wm_window.h"
 
 #include "ash/aura/aura_layout_manager_adapter.h"
 #include "ash/aura/wm_shell_aura.h"
 #include "ash/common/ash_constants.h"
 #include "ash/common/shelf/shelf_item_types.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm_layout_manager.h"
 #include "ash/common/wm_transient_window_observer.h"
 #include "ash/common/wm_window_property.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/public/cpp/window_properties.h"
 #include "ash/root_window_controller.h"
-#include "ash/screen_util.h"
 #include "ash/shell.h"
 #include "ash/wm/resize_handle_window_targeter.h"
 #include "ash/wm/resize_shadow_controller.h"
 #include "ash/wm/window_animations.h"
 #include "ash/wm/window_mirror_view.h"
 #include "ash/wm/window_properties.h"
 #include "ash/wm/window_state_aura.h"
 #include "ash/wm/window_util.h"
 #include "base/memory/ptr_util.h"
 #include "services/ui/public/interfaces/window_manager_constants.mojom.h"
@@ skipping 208 matching lines @@
   return result;
 }
 
 gfx::Point WmWindow::ConvertPointFromScreen(const gfx::Point& point) const {
   gfx::Point result(point);
   ::wm::ConvertPointFromScreen(window_, &result);
   return result;
 }
 
 gfx::Rect WmWindow::ConvertRectToScreen(const gfx::Rect& rect) const {
-  return ScreenUtil::ConvertRectToScreen(window_, rect);
+  gfx::Rect result(rect);
+  ::wm::ConvertRectToScreen(window_, &result);
+  return result;
 }
 
 gfx::Rect WmWindow::ConvertRectFromScreen(const gfx::Rect& rect) const {
-  return ScreenUtil::ConvertRectFromScreen(window_, rect);
+  gfx::Rect result(rect);
+  ::wm::ConvertRectFromScreen(window_, &result);
+  return result;
 }
 
 gfx::Size WmWindow::GetMinimumSize() const {
   return window_->delegate() && !use_empty_minimum_size_for_testing_
              ? window_->delegate()->GetMinimumSize()
              : gfx::Size();
 }
 
 gfx::Size WmWindow::GetMaximumSize() const {
   return window_->delegate() ? window_->delegate()->GetMaximumSize()
@@ skipping 652 matching lines @@
     observer.OnTransientChildAdded(this, Get(transient));
 }
 
 void WmWindow::OnTransientChildRemoved(aura::Window* window,
                                        aura::Window* transient) {
   for (auto& observer : transient_observers_)
     observer.OnTransientChildRemoved(this, Get(transient));
 }
 
 }  // namespace ash