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

ash/touch/touch_transformer_controller.cc

Index: ash/touch/touch_transformer_controller.cc
diff --git a/ash/touch/touch_transformer_controller.cc b/ash/touch/touch_transformer_controller.cc
index 2fac6625d6c7486e2b24ef3456ce79079e23ffa7..539f55d5c95a484448185ccd0430f182f489bce0 100644
--- a/ash/touch/touch_transformer_controller.cc
+++ b/ash/touch/touch_transformer_controller.cc
@@ -155,12 +155,12 @@ void TouchTransformerController::UpdateTouchTransformer() const {
   device_manager->ClearTouchDeviceAssociations();
 
   // Display IDs and DisplayInfo for mirror or extended mode.
-  int64_t display1_id = gfx::Display::kInvalidDisplayID;
-  int64_t display2_id = gfx::Display::kInvalidDisplayID;
+  int64_t display1_id = display::Display::kInvalidDisplayID;
+  int64_t display2_id = display::Display::kInvalidDisplayID;
   DisplayInfo display1;
   DisplayInfo display2;
   // Display ID and DisplayInfo for single display mode.
-  int64_t single_display_id = gfx::Display::kInvalidDisplayID;
+  int64_t single_display_id = display::Display::kInvalidDisplayID;
   DisplayInfo single_display;
 
   WindowTreeHostManager* window_tree_host_manager =
@@ -171,15 +171,15 @@ void TouchTransformerController::UpdateTouchTransformer() const {
   } else if (display_manager->num_connected_displays() == 1 ||
              display_manager->IsInUnifiedMode()) {
     single_display_id = display_manager->first_display_id();
-    DCHECK(single_display_id != gfx::Display::kInvalidDisplayID);
+    DCHECK(single_display_id != display::Display::kInvalidDisplayID);
     single_display = display_manager->GetDisplayInfo(single_display_id);
     UpdateTouchRadius(single_display);
   } else {
     display::DisplayIdList list = display_manager->GetCurrentDisplayIdList();
     display1_id = list[0];
     display2_id = list[1];
-    DCHECK(display1_id != gfx::Display::kInvalidDisplayID &&
-           display2_id != gfx::Display::kInvalidDisplayID);
+    DCHECK(display1_id != display::Display::kInvalidDisplayID &&
+           display2_id != display::Display::kInvalidDisplayID);
     display1 = display_manager->GetDisplayInfo(display1_id);
     display2 = display_manager->GetDisplayInfo(display2_id);
     UpdateTouchRadius(display1);