Move kInvalidDisplayID to display_constants.h.

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/display/types/display_constants.h"
 #include "ui/events/devices/input_device_event_observer.h"
 #include "ui/gfx/geometry/point3_f.h"
 
 // This macro provides the implementation for the observer notification methods.
 #define NOTIFY_OBSERVERS(method_decl, observer_call)      \
   void DeviceDataManager::method_decl {                   \
     for (InputDeviceEventObserver& observer : observers_) \
       observer.observer_call;                             \
   }
 
 namespace ui {
 
 namespace {
 
 bool InputDeviceEquals(const ui::InputDevice& a, const ui::InputDevice& b) {
   return a.id == b.id;
 }
 
 }  // namespace
 
 DeviceDataManager::TouchscreenInfo::TouchscreenInfo() {
   Reset();
 }
 
 void DeviceDataManager::TouchscreenInfo::Reset() {
   radius_scale = 1.0;
-  target_display = display::Display::kInvalidDisplayID;
+  target_display = display::kInvalidDisplayId;
   device_transform = gfx::Transform();
 }
 
 // static
 DeviceDataManager* DeviceDataManager::instance_ = nullptr;
 
 DeviceDataManager::DeviceDataManager() {
   InputDeviceManager::SetInstance(this);
 }
 
@@ skipping 104 matching lines @@
 }
 
 bool DeviceDataManager::AreDeviceListsComplete() const {
   return device_lists_complete_;
 }
 
 int64_t DeviceDataManager::GetTargetDisplayForTouchDevice(
     int touch_device_id) const {
   if (IsTouchDeviceIdValid(touch_device_id))
     return touch_map_[touch_device_id].target_display;
-  return display::Display::kInvalidDisplayID;
+  return 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 79 matching lines @@
 
 void DeviceDataManager::SetTouchscreensEnabled(bool enabled) {
   touch_screens_enabled_ = enabled;
 }
 
 bool DeviceDataManager::AreTouchscreensEnabled() const {
   return touch_screens_enabled_;
 }
 
 }  // namespace ui