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

ash/shell/panel_window.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/shell/panel_window.h"
 
 #include "ash/common/wm/panels/panel_frame_view.h"
 #include "ash/public/cpp/window_properties.h"
-#include "ash/screen_util.h"
 #include "ash/shell.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/aura/window.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/widget/widget.h"
+#include "ui/wm/core/coordinate_conversion.h"
 
 namespace {
 const int kMinWidth = 100;
 const int kMinHeight = 100;
 const int kDefaultWidth = 200;
 const int kDefaultHeight = 300;
 }
 
 namespace ash {
 
@@ skipping 12 matching lines @@
 
 PanelWindow::~PanelWindow() {}
 
 views::Widget* PanelWindow::CreateWidget() {
   views::Widget* widget = new views::Widget;
 
   if (params().bounds.width() == 0)
     params().bounds.set_width(kDefaultWidth);
   if (params().bounds.height() == 0)
     params().bounds.set_height(kDefaultHeight);
-  params().bounds = ScreenUtil::ConvertRectToScreen(
-      Shell::GetTargetRootWindow(), params().bounds);
+  ::wm::ConvertRectToScreen(Shell::GetTargetRootWindow(), &params().bounds);
 
   widget->Init(params());
   widget->GetNativeView()->SetName(name_);
   widget->GetNativeWindow()->SetProperty<int>(kShelfItemTypeKey,
                                               TYPE_APP_PANEL);
   widget->Show();
 
   return widget;
 }
 
@@ skipping 20 matching lines @@
 bool PanelWindow::CanMinimize() const {
   return false;
 }
 
 views::NonClientFrameView* PanelWindow::CreateNonClientFrameView(
     views::Widget* widget) {
   return new PanelFrameView(widget, PanelFrameView::FRAME_NONE);
 }
 
 }  // namespace ash