Rename gfx::Display/Screen to display::Display/Screen in ash

ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.cc

Index: ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.cc
diff --git a/ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.cc b/ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.cc
index 5147d08433865608600971eb116dd34191270a08..a8fedabe23b540c950fa216a1de6c5d59ac94dcc 100644
--- a/ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.cc
+++ b/ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.cc
@@ -4,8 +4,8 @@
 
 #include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.h"
 
-#include <X11/Xlib.h>
 #include <X11/extensions/XInput2.h>
+#include <X11/Xlib.h>
 
 #include <memory>
 #include <set>
@@ -50,8 +50,8 @@ gfx::Point GetMouseLocationInScreen() {
 }
 
 void SetMouseLocationInScreen(const gfx::Point& screen_location) {
-  gfx::Display display = ash::ScreenUtil::FindDisplayContainingPoint(
-      screen_location);
+  display::Display display =
+      ash::ScreenUtil::FindDisplayContainingPoint(screen_location);
   if (!display.is_valid())
     return;
   aura::Window* root_window = Shell::GetInstance()