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

ui/events/event_utils.h

 // 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.
 
 #ifndef UI_EVENTS_EVENT_UTILS_H_
 #define UI_EVENTS_EVENT_UTILS_H_
 
 #include <stdint.h>
 
 #include <memory>
 
 #include "base/event_types.h"
 #include "base/strings/string16.h"
 #include "build/build_config.h"
+#include "ui/display/display.h"
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/events_export.h"
 #include "ui/events/keycodes/keyboard_codes.h"
-#include "ui/gfx/display.h"
 #include "ui/gfx/native_widget_types.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 
 namespace gfx {
 class Point;
 class Vector2d;
 }
@@ skipping 115 matching lines @@
                                     float* x_offset,
                                     float* y_offset,
                                     float* x_offset_ordinal,
                                     float* y_offset_ordinal,
                                     int* finger_count);
 
 // Returns whether natural scrolling should be used for touchpad.
 EVENTS_EXPORT bool ShouldDefaultToNaturalScroll();
 
 // Returns whether or not the internal display produces touch events.
-EVENTS_EXPORT gfx::Display::TouchSupport GetInternalDisplayTouchSupport();
+EVENTS_EXPORT display::Display::TouchSupport GetInternalDisplayTouchSupport();
 
 #if defined(OS_WIN)
 EVENTS_EXPORT int GetModifiersFromKeyState();
 
 // Returns true if |message| identifies a mouse event that was generated as the
 // result of a touch event.
 EVENTS_EXPORT bool IsMouseEventFromTouch(UINT message);
 
 // Converts scan code and lParam each other.  The scan code
 // representing an extended key contains 0xE000 bits.
 EVENTS_EXPORT uint16_t GetScanCodeFromLParam(LPARAM lParam);
 EVENTS_EXPORT LPARAM GetLParamFromScanCode(uint16_t scan_code);
 
 #endif
 
 #if defined(USE_X11)
 // Update the native X11 event to correspond to the new flags.
 EVENTS_EXPORT void UpdateX11EventForFlags(Event* event);
 // Update the native X11 event to correspond to the new button flags.
 EVENTS_EXPORT void UpdateX11EventForChangedButtonFlags(MouseEvent* event);
 #endif
 
 // Registers a custom event type.
 EVENTS_EXPORT int RegisterCustomEventType();
 
 }  // namespace ui
 
 #endif  // UI_EVENTS_EVENT_UTILS_H_