| Index: ash/display/unified_mouse_warp_controller.cc
|
| diff --git a/ash/display/unified_mouse_warp_controller.cc b/ash/display/unified_mouse_warp_controller.cc
|
| index 228360cfd9146c1b0d82ae714f463fd91492367a..613c0e5b1778a6dd3a7af82e703b5a6c2b971a6c 100644
|
| --- a/ash/display/unified_mouse_warp_controller.cc
|
| +++ b/ash/display/unified_mouse_warp_controller.cc
|
| @@ -56,7 +56,7 @@ aura::WindowTreeHost* FindMirroringWindowTreeHostFromScreenPoint(
|
| } // namespace
|
|
|
| UnifiedMouseWarpController::UnifiedMouseWarpController()
|
| - : current_cursor_display_id_(display::Display::kInvalidDisplayID),
|
| + : current_cursor_display_id_(display::kInvalidDisplayId),
|
| update_location_for_test_(false) {}
|
|
|
| UnifiedMouseWarpController::~UnifiedMouseWarpController() {}
|
| @@ -74,7 +74,7 @@ bool UnifiedMouseWarpController::WarpMouseCursor(ui::MouseEvent* event) {
|
| // transform back to the host coordinates.
|
| target->GetHost()->GetRootTransform().TransformPoint(&point_in_unified_host);
|
|
|
| - if (current_cursor_display_id_ != display::Display::kInvalidDisplayID) {
|
| + if (current_cursor_display_id_ != display::kInvalidDisplayId) {
|
| aura::client::CursorClient* cursor_client =
|
| aura::client::GetCursorClient(target->GetRootWindow());
|
| if (cursor_client) {
|
| @@ -88,7 +88,7 @@ bool UnifiedMouseWarpController::WarpMouseCursor(ui::MouseEvent* event) {
|
| const display::Display& new_display = mirroring_display_list[index];
|
| if (current_cursor_display_id_ != new_display.id()) {
|
| cursor_client->SetDisplay(new_display);
|
| - current_cursor_display_id_ = display::Display::kInvalidDisplayID;
|
| + current_cursor_display_id_ = display::kInvalidDisplayId;
|
| }
|
| }
|
| }
|
|
|