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

ash/wm/drag_window_resizer.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/wm/drag_window_resizer.h"
 
 #include "ash/common/wm/window_positioning_utils.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm_window.h"
 #include "ash/display/mouse_cursor_event_filter.h"
-#include "ash/screen_util.h"
 #include "ash/shell.h"
 #include "ash/wm/drag_window_controller.h"
 #include "ash/wm/window_util.h"
 #include "base/memory/weak_ptr.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/base/hit_test.h"
@@ skipping 62 matching lines @@
     const gfx::Size& size = dst_display.work_area().size();
     gfx::Rect bounds = GetAuraTarget()->bounds();
     if (bounds.width() > size.width()) {
       int diff = bounds.width() - size.width();
       bounds.set_x(bounds.x() + diff / 2);
       bounds.set_width(size.width());
     }
     if (bounds.height() > size.height())
       bounds.set_height(size.height());
 
-    gfx::Rect dst_bounds =
-        ScreenUtil::ConvertRectToScreen(GetAuraTarget()->parent(), bounds);
+    gfx::Rect dst_bounds = bounds;
+    ::wm::ConvertRectToScreen(GetAuraTarget()->parent(), &dst_bounds);
 
     // Adjust the position so that the cursor is on the window.
     if (!dst_bounds.Contains(last_mouse_location_in_screen)) {
       if (last_mouse_location_in_screen.x() < dst_bounds.x())
         dst_bounds.set_x(last_mouse_location_in_screen.x());
       else if (last_mouse_location_in_screen.x() > dst_bounds.right())
         dst_bounds.set_x(last_mouse_location_in_screen.x() -
                          dst_bounds.width());
     }
     ash::wm::AdjustBoundsToEnsureMinimumWindowVisibility(dst_display.bounds(),
@@ skipping 31 matching lines @@
 
 void DragWindowResizer::UpdateDragWindow(
     const gfx::Rect& bounds_in_parent,
     const gfx::Point& drag_location_in_screen) {
   if (details().window_component != HTCAPTION || !ShouldAllowMouseWarp())
     return;
 
   if (!drag_window_controller_)
     drag_window_controller_.reset(new DragWindowController(GetAuraTarget()));
 
-  const gfx::Rect bounds_in_screen = ScreenUtil::ConvertRectToScreen(
-      GetAuraTarget()->parent(), bounds_in_parent);
+  gfx::Rect bounds_in_screen = bounds_in_parent;
+  ::wm::ConvertRectToScreen(GetAuraTarget()->parent(), &bounds_in_screen);
 
   gfx::Rect root_bounds_in_screen =
       GetAuraTarget()->GetRootWindow()->GetBoundsInScreen();
   float opacity = 1.0f;
   if (!root_bounds_in_screen.Contains(drag_location_in_screen)) {
     gfx::Rect visible_bounds = root_bounds_in_screen;
     visible_bounds.Intersect(bounds_in_screen);
     opacity = DragWindowController::GetDragWindowOpacity(bounds_in_screen,
                                                          visible_bounds);
   }
   GetAuraTarget()->layer()->SetOpacity(opacity);
   drag_window_controller_->Update(bounds_in_screen, drag_location_in_screen);
 }
 
 bool DragWindowResizer::ShouldAllowMouseWarp() {
   return details().window_component == HTCAPTION &&
          !::wm::GetTransientParent(GetAuraTarget()) &&
          wm::IsWindowUserPositionable(GetAuraTarget());
 }
 
 aura::Window* DragWindowResizer::GetAuraTarget() {
   return WmWindow::GetAuraWindow(GetTarget());
 }
 
 }  // namespace ash