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

ui/views/widget/desktop_aura/desktop_screen_win.cc

Index: ui/views/widget/desktop_aura/desktop_screen_win.cc
diff --git a/ui/views/widget/desktop_aura/desktop_screen_win.cc b/ui/views/widget/desktop_aura/desktop_screen_win.cc
index 4df7b7ffae5721b6077dc04de26aff9949ca2b22..f772f64d656e88cd2631e388f92e00a845f84f16 100644
--- a/ui/views/widget/desktop_aura/desktop_screen_win.cc
+++ b/ui/views/widget/desktop_aura/desktop_screen_win.cc
@@ -8,7 +8,7 @@
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/aura/window_tree_host.h"
-#include "ui/gfx/display.h"
+#include "ui/display/display.h"
 #include "ui/views/widget/desktop_aura/desktop_screen.h"
 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_win.h"
 
@@ -26,7 +26,7 @@ DesktopScreenWin::~DesktopScreenWin() {
 ////////////////////////////////////////////////////////////////////////////////
 // DesktopScreenWin, display::win::ScreenWin implementation:
 
-gfx::Display DesktopScreenWin::GetDisplayMatching(
+display::Display DesktopScreenWin::GetDisplayMatching(
     const gfx::Rect& match_rect) const {
   return GetDisplayNearestPoint(match_rect.CenterPoint());
 }
@@ -43,7 +43,7 @@ gfx::NativeWindow DesktopScreenWin::GetNativeWindowFromHWND(HWND hwnd) const {
 
 ////////////////////////////////////////////////////////////////////////////////
 
-gfx::Screen* CreateDesktopScreen() {
+display::Screen* CreateDesktopScreen() {
   return new DesktopScreenWin;
 }