Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(193)

Unified Diff: ash/shell/panel_window.cc

Issue 2660873002: Move two utility functions from ash/screen_util.h to ui/wm/core/coordinate_conversion.h (Closed)
Patch Set: rebase Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/screen_util_unittest.cc ('k') | ash/wm/drag_window_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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(), &params().bounds);
widget->Init(params());
widget->GetNativeView()->SetName(name_);
« no previous file with comments | « ash/screen_util_unittest.cc ('k') | ash/wm/drag_window_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698