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

ash/wm/drag_window_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/wm/drag_window_controller.h"
 
 #include <algorithm>
 
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/public/cpp/shell_window_ids.h"
-#include "ash/screen_util.h"
 #include "ash/shell.h"
 #include "ash/wm/window_util.h"
 #include "base/memory/ptr_util.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/screen_position_client.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"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_tree_owner.h"
 #include "ui/compositor/paint_context.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
+#include "ui/wm/core/coordinate_conversion.h"
 #include "ui/wm/core/shadow_types.h"
 #include "ui/wm/core/window_util.h"
 
 namespace ash {
 
 // This keeps track of the drag window's state. It creates/destroys/updates
 // bounds and opacity based on the current bounds.
 class DragWindowController::DragWindowDetails : public aura::WindowDelegate {
  public:
   DragWindowDetails(const display::Display& display,
@@ skipping 15 matching lines @@
       delete drag_window_;
       // Make sure drag_window_ is reset so that new drag window will be created
       // when it becomes necessary again.
       DCHECK(!drag_window_);
       layer_owner_.reset();
       return;
     }
     if (!drag_window_)
       CreateDragWindow(original_window, bounds_in_screen);
 
-    gfx::Rect bounds_in_root = ScreenUtil::ConvertRectFromScreen(
-        drag_window_->parent(), bounds_in_screen);
+    gfx::Rect bounds_in_root = bounds_in_screen;
+    ::wm::ConvertRectFromScreen(drag_window_->parent(), &bounds_in_root);
     drag_window_->SetBounds(bounds_in_root);
     if (root_bounds_in_screen.Contains(drag_location_in_screen)) {
       SetOpacity(original_window, 1.f);
     } else {
       drag_window_->SetBounds(bounds_in_root);
       gfx::Rect visible_bounds = root_bounds_in_screen;
       visible_bounds.Intersect(bounds_in_screen);
       SetOpacity(original_window,
                  GetDragWindowOpacity(bounds_in_screen, visible_bounds));
     }
@@ skipping 169 matching lines @@
       layers.pop_back();
       if (layer->delegate())
         layer->delegate()->OnPaintLayer(context);
       for (auto* child : layer->children())
         layers.push_back(child);
     }
   }
 }
 
 }  // namespace ash