Move gfx::Display/Screen to display::Display/Screen in aura/events

ui/events/gesture_detection/gesture_provider_config_helper.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 "ui/events/gesture_detection/gesture_provider_config_helper.h"
 
+#include "ui/display/screen.h"
 #include "ui/events/gesture_detection/gesture_configuration.h"
-#include "ui/gfx/screen.h"
 
 namespace ui {
 namespace {
 
 class GenericDesktopGestureConfiguration : public GestureConfiguration {
  public:
   // The default GestureConfiguration parameters are already tailored for a
   // desktop environment (Aura).
   GenericDesktopGestureConfiguration() {}
   ~GenericDesktopGestureConfiguration() override {}
@@ skipping 63 matching lines @@
       config = BuildGestureProviderConfig(*GestureConfiguration::GetInstance());
       break;
     case GestureProviderConfigType::GENERIC_DESKTOP:
       config = BuildGestureProviderConfig(GenericDesktopGestureConfiguration());
       break;
     case GestureProviderConfigType::GENERIC_MOBILE:
       // The default GestureProvider::Config embeds a mobile configuration.
       break;
   }
 
-  gfx::Screen* screen = gfx::Screen::GetScreen();
+  display::Screen* screen = display::Screen::GetScreen();
   // |screen| is sometimes NULL during tests.
   if (screen)
     config.display = screen->GetPrimaryDisplay();
 
   return config;
 }
 
 }  // namespace ui