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

Unified Diff: ash/wm/workspace/workspace_window_resizer.cc

Issue 1924703002: Rename gfx::Display/Screen to display::Display/Screen in ash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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
Index: ash/wm/workspace/workspace_window_resizer.cc
diff --git a/ash/wm/workspace/workspace_window_resizer.cc b/ash/wm/workspace/workspace_window_resizer.cc
index 60754440426ab45624f79f3acb804d3fa581e93c..1540fa2c7169f874b9160283225c96c965cf0e9b 100644
--- a/ash/wm/workspace/workspace_window_resizer.cc
+++ b/ash/wm/workspace/workspace_window_resizer.cc
@@ -29,7 +29,7 @@
#include "base/memory/weak_ptr.h"
#include "ui/base/hit_test.h"
#include "ui/compositor/layer.h"
-#include "ui/gfx/screen.h"
+#include "ui/display/screen.h"
#include "ui/gfx/transform.h"
#include "ui/wm/public/window_types.h"
@@ -373,8 +373,8 @@ void WorkspaceWindowResizer::Drag(const gfx::Point& location_in_parent,
GetTarget()->GetParent()->ConvertPointToScreen(location_in_parent);
wm::WmWindow* root = nullptr;
- gfx::Display display =
- gfx::Screen::GetScreen()->GetDisplayNearestPoint(location_in_screen);
+ display::Display display =
+ display::Screen::GetScreen()->GetDisplayNearestPoint(location_in_screen);
// Track the last screen that the pointer was on to keep the snap phantom
// window there.
if (display.bounds().Contains(location_in_screen)) {
@@ -767,8 +767,9 @@ void WorkspaceWindowResizer::AdjustBoundsForMainWindow(
gfx::Rect* bounds) {
gfx::Point last_mouse_location_in_screen =
GetTarget()->GetParent()->ConvertPointToScreen(last_mouse_location_);
- gfx::Display display = gfx::Screen::GetScreen()->GetDisplayNearestPoint(
- last_mouse_location_in_screen);
+ display::Display display =
+ display::Screen::GetScreen()->GetDisplayNearestPoint(
+ last_mouse_location_in_screen);
gfx::Rect work_area =
GetTarget()->GetParent()->ConvertRectFromScreen(display.work_area());
if (details().window_component == HTCAPTION) {
« no previous file with comments | « ash/wm/workspace/workspace_layout_manager_unittest.cc ('k') | ash/wm/workspace/workspace_window_resizer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698