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

ui/events/devices/device_data_manager.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/devices/device_data_manager.h"
 
 #include "base/at_exit.h"
 #include "base/bind.h"
 #include "base/logging.h"
+#include "ui/display/display.h"
 #include "ui/events/devices/input_device_event_observer.h"
-#include "ui/gfx/display.h"
 #include "ui/gfx/geometry/point3_f.h"
 
 // This macro provides the implementation for the observer notification methods.
 #define NOTIFY_OBSERVERS(method_name, observer_method)      \
   void DeviceDataManager::method_name() {                   \
     FOR_EACH_OBSERVER(InputDeviceEventObserver, observers_, \
                       observer_method());                   \
   }
 
 namespace ui {
@@ skipping 51 matching lines @@
 }
 
 // static
 bool DeviceDataManager::HasInstance() {
   return instance_ != NULL;
 }
 
 void DeviceDataManager::ClearTouchDeviceAssociations() {
   for (int i = 0; i < kMaxDeviceNum; i++) {
     touch_device_transformer_map_[i] = gfx::Transform();
-    touch_device_to_target_display_map_[i] = gfx::Display::kInvalidDisplayID;
+    touch_device_to_target_display_map_[i] =
+        display::Display::kInvalidDisplayID;
     touch_radius_scale_map_[i] = 1.0;
   }
 }
 
 bool DeviceDataManager::IsTouchDeviceIdValid(
     int touch_device_id) const {
   return (touch_device_id > 0 && touch_device_id < kMaxDeviceNum);
 }
 
 void DeviceDataManager::UpdateTouchInfoForDisplay(
@@ skipping 28 matching lines @@
     trans.TransformPoint(&point);
     *x = point.x();
     *y = point.y();
   }
 }
 
 int64_t DeviceDataManager::GetTargetDisplayForTouchDevice(
     int touch_device_id) const {
   if (IsTouchDeviceIdValid(touch_device_id))
     return touch_device_to_target_display_map_[touch_device_id];
-  return gfx::Display::kInvalidDisplayID;
+  return display::Display::kInvalidDisplayID;
 }
 
 void DeviceDataManager::OnTouchscreenDevicesUpdated(
     const std::vector<TouchscreenDevice>& devices) {
   if (devices.size() == touchscreen_devices_.size() &&
       std::equal(devices.begin(),
                  devices.end(),
                  touchscreen_devices_.begin(),
                  InputDeviceEquals)) {
     return;
@@ skipping 72 matching lines @@
 
 void DeviceDataManager::SetTouchscreensEnabled(bool enabled) {
   touch_screens_enabled_ = enabled;
 }
 
 bool DeviceDataManager::AreTouchscreensEnabled() const {
   return touch_screens_enabled_;
 }
 
 }  // namespace ui