Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(124)

Unified Diff: ui/events/devices/device_data_manager.cc

Issue 2519993002: Move kInvalidDisplayID to display_constants.h. (Closed)
Patch Set: Address comments. Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/events/devices/BUILD.gn ('k') | ui/events/gesture_detection/gesture_provider.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/devices/device_data_manager.cc
diff --git a/ui/events/devices/device_data_manager.cc b/ui/events/devices/device_data_manager.cc
index 94bbeb16f033ace67ecaf8c1ccf9d50bb057073e..38a184cf91c40a18ddfa533b055dac5aba3fa4b9 100644
--- a/ui/events/devices/device_data_manager.cc
+++ b/ui/events/devices/device_data_manager.cc
@@ -7,7 +7,7 @@
#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"
@@ -34,7 +34,7 @@ DeviceDataManager::TouchscreenInfo::TouchscreenInfo() {
void DeviceDataManager::TouchscreenInfo::Reset() {
radius_scale = 1.0;
- target_display = display::Display::kInvalidDisplayID;
+ target_display = display::kInvalidDisplayId;
device_transform = gfx::Transform();
}
@@ -159,7 +159,7 @@ 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(
« no previous file with comments | « ui/events/devices/BUILD.gn ('k') | ui/events/gesture_detection/gesture_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698