| Index: ash/shell/panel_window.cc
|
| diff --git a/ash/shell/panel_window.cc b/ash/shell/panel_window.cc
|
| index e10c68cd30de1d82228a9968d87e8cae9cccc352..5566a024da44d092f25189ce449f209d9b09a6f8 100644
|
| --- a/ash/shell/panel_window.cc
|
| +++ b/ash/shell/panel_window.cc
|
| @@ -6,12 +6,12 @@
|
|
|
| #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;
|
| @@ -44,8 +44,7 @@ views::Widget* PanelWindow::CreateWidget() {
|
| 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(), ¶ms().bounds);
|
|
|
| widget->Init(params());
|
| widget->GetNativeView()->SetName(name_);
|
|
|