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

ash/magnifier/magnification_controller.cc

 // Copyright (c) 2012 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/magnifier/magnification_controller.h"
 
 #include <memory>
 #include <utility>
 
 #include "ash/common/accelerators/accelerator_controller.h"
 #include "ash/common/accessibility_delegate.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/wm_shell.h"
 #include "ash/display/root_window_transformers.h"
 #include "ash/host/ash_window_tree_host.h"
 #include "ash/host/root_window_transformer.h"
 #include "ash/root_window_controller.h"
-#include "ash/screen_util.h"
 #include "ash/shell.h"
 #include "base/command_line.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/timer/timer.h"
 #include "ui/aura/client/cursor_client.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/ime/input_method.h"
 #include "ui/base/ime/input_method_observer.h"
 #include "ui/base/ime/text_input_client.h"
@@ skipping 401 matching lines @@
     bool is_editable_node,
     const gfx::Rect& node_bounds_in_screen) {
   // The editable node is handled by OnCaretBoundsChanged.
   if (is_editable_node)
     return;
 
   // Nothing to recenter on.
   if (node_bounds_in_screen.IsEmpty())
     return;
 
-  gfx::Rect node_bounds_in_root =
-      ScreenUtil::ConvertRectFromScreen(root_window_, node_bounds_in_screen);
+  gfx::Rect node_bounds_in_root = node_bounds_in_screen;
+  ::wm::ConvertRectFromScreen(root_window_, &node_bounds_in_root);
   if (GetViewportRect().Contains(node_bounds_in_root))
     return;
 
   MoveMagnifierWindowFollowRect(node_bounds_in_root);
 }
 
 void MagnificationControllerImpl::SwitchTargetRootWindow(
     aura::Window* new_root_window,
     bool redraw_original_root_window) {
   DCHECK(new_root_window);
@@ skipping 405 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // MagnificationController:
 
 // static
 MagnificationController* MagnificationController::CreateInstance() {
   return new MagnificationControllerImpl();
 }
 
 }  // namespace ash