Rename gfx::Display/Screen to display::Display/Screen in views/wm

ui/wm/core/default_screen_position_client.cc

Index: ui/wm/core/default_screen_position_client.cc
diff --git a/ui/wm/core/default_screen_position_client.cc b/ui/wm/core/default_screen_position_client.cc
index 092b2da6b43d2a45e47cfca695907a78a641992c..67520bb5ce654c088ed47b76c25b94acf7622c7f 100644
--- a/ui/wm/core/default_screen_position_client.cc
+++ b/ui/wm/core/default_screen_position_client.cc
@@ -5,10 +5,9 @@
 #include "ui/wm/core/default_screen_position_client.h"
 
 #include "ui/aura/window_tree_host.h"
-#include "ui/gfx/display.h"
+#include "ui/display/screen.h"
 #include "ui/gfx/geometry/point_conversions.h"
 #include "ui/gfx/geometry/rect.h"
-#include "ui/gfx/screen.h"
 
 namespace wm {
 
@@ -21,7 +20,7 @@ DefaultScreenPositionClient::~DefaultScreenPositionClient() {
 gfx::Point DefaultScreenPositionClient::GetOriginInScreen(
     const aura::Window* root_window) {
   aura::Window* window = const_cast<aura::Window*>(root_window);
-  gfx::Screen* screen = gfx::Screen::GetScreen();
+  display::Screen* screen = display::Screen::GetScreen();
   gfx::Rect screen_bounds = root_window->GetHost()->GetBounds();
   gfx::Rect dip_bounds = screen->ScreenToDIPRectInWindow(window, screen_bounds);
   return dip_bounds.origin();
@@ -53,7 +52,7 @@ void DefaultScreenPositionClient::ConvertHostPointToScreen(aura::Window* window,
 
 void DefaultScreenPositionClient::SetBounds(aura::Window* window,
                                             const gfx::Rect& bounds,
-                                            const gfx::Display& display) {
+                                            const display::Display& display) {
   window->SetBounds(bounds);
 }