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

ui/events/event_utils.cc

Index: ui/events/event_utils.cc
diff --git a/ui/events/event_utils.cc b/ui/events/event_utils.cc
index 503d74804d4f8d769f92731b2746766a27168e6e..9291a589af5b7dc281714395c9bd61d41a487c54 100644
--- a/ui/events/event_utils.cc
+++ b/ui/events/event_utils.cc
@@ -6,8 +6,8 @@
 
 #include <vector>
 
-#include "ui/gfx/display.h"
-#include "ui/gfx/screen.h"
+#include "ui/display/display.h"
+#include "ui/display/screen.h"
 
 namespace ui {
 
@@ -67,21 +67,21 @@ base::TimeDelta EventTimeForNow() {
 
 bool ShouldDefaultToNaturalScroll() {
   return GetInternalDisplayTouchSupport() ==
-      gfx::Display::TOUCH_SUPPORT_AVAILABLE;
+         display::Display::TOUCH_SUPPORT_AVAILABLE;
 }
 
-gfx::Display::TouchSupport GetInternalDisplayTouchSupport() {
-  gfx::Screen* screen = gfx::Screen::GetScreen();
+display::Display::TouchSupport GetInternalDisplayTouchSupport() {
+  display::Screen* screen = display::Screen::GetScreen();
   // No screen in some unit tests.
   if (!screen)
-    return gfx::Display::TOUCH_SUPPORT_UNKNOWN;
-  const std::vector<gfx::Display>& displays = screen->GetAllDisplays();
-  for (std::vector<gfx::Display>::const_iterator it = displays.begin();
+    return display::Display::TOUCH_SUPPORT_UNKNOWN;
+  const std::vector<display::Display>& displays = screen->GetAllDisplays();
+  for (std::vector<display::Display>::const_iterator it = displays.begin();
        it != displays.end(); ++it) {
     if (it->IsInternal())
       return it->touch_support();
   }
-  return gfx::Display::TOUCH_SUPPORT_UNAVAILABLE;
+  return display::Display::TOUCH_SUPPORT_UNAVAILABLE;
 }
 
 }  // namespace ui