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

ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.h"
 
+#include <X11/extensions/XInput2.h>
 #include <X11/Xlib.h>
-#include <X11/extensions/XInput2.h>
 
 #include <memory>
 #include <set>
 #include <utility>
 
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/screen_util.h"
 #include "ash/shell.h"
 #include "base/strings/string_util.h"
 #include "ui/aura/client/cursor_client.h"
@@ skipping 24 matching lines @@
 const char kCoreKeyboardName[] = "Virtual core keyboard";
 
 // Device id used to indicate that a device has not been detected.
 const int kDeviceIdNone = -1;
 
 gfx::Point GetMouseLocationInScreen() {
   return aura::Env::GetInstance()->last_mouse_location();
 }
 
 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()
                                   ->window_tree_host_manager()
                                   ->GetRootWindowForDisplayId(display.id());
   gfx::Point host_location(screen_location);
   aura::client::ScreenPositionClient* client =
       aura::client::GetScreenPositionClient(root_window);
   if (client)
     client->ConvertPointFromScreen(root_window, &host_location);
@@ skipping 95 matching lines @@
     // blocked. Move the mouse cursor back to its last known location resulting
     // from an external mouse to prevent the internal touchpad from moving it.
     SetMouseLocationInScreen(last_mouse_location_);
   } else {
     // Track the last location seen from an external mouse event.
     last_mouse_location_ = GetMouseLocationInScreen();
   }
 }
 
 }  // namespace ash