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

ui/events/event_utils.cc

 // Copyright (c) 2012 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/event_utils.h"
 
 #include <vector>
 
-#include "ui/gfx/display.h"
-#include "ui/gfx/screen.h"
+#include "ui/display/display.h"
+#include "ui/display/screen.h"
 
 namespace ui {
 
 namespace {
 int g_custom_event_types = ET_LAST;
 }  // namespace
 
 std::unique_ptr<Event> EventFromNative(const base::NativeEvent& native_event) {
   std::unique_ptr<Event> event;
   EventType type = EventTypeFromNative(native_event);
@@ skipping 39 matching lines @@
   return ++g_custom_event_types;
 }
 
 base::TimeDelta EventTimeForNow() {
   return base::TimeDelta::FromInternalValue(
       base::TimeTicks::Now().ToInternalValue());
 }
 
 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