Update display::Display::kInvalidDisplayID constant.

ash/display/unified_mouse_warp_controller.cc

 // Copyright 2015 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 "ash/display/unified_mouse_warp_controller.h"
 
 #include <cmath>
 
 #include "ash/display/display_util.h"
 #include "ash/display/mirror_window_controller.h"
@@ skipping 38 matching lines @@
     return nullptr;
   return GetMirroringAshWindowTreeHostForDisplayId(
              mirroring_display_list[index].id())
       ->AsWindowTreeHost();
 }
 #endif
 
 }  // namespace
 
 UnifiedMouseWarpController::UnifiedMouseWarpController()
-    : current_cursor_display_id_(display::Display::kInvalidDisplayID),
+    : current_cursor_display_id_(display::kInvalidDisplayId),
       update_location_for_test_(false) {}
 
 UnifiedMouseWarpController::~UnifiedMouseWarpController() {}
 
 bool UnifiedMouseWarpController::WarpMouseCursor(ui::MouseEvent* event) {
   // Mirroring windows are created asynchronously, so compute the edge
   // beounds when we received an event instead of in constructor.
   if (first_edge_bounds_in_native_.IsEmpty())
     ComputeBounds();
 
   aura::Window* target = static_cast<aura::Window*>(event->target());
   gfx::Point point_in_unified_host = event->location();
   ::wm::ConvertPointToScreen(target, &point_in_unified_host);
   // The display bounds of the mirroring windows isn't scaled, so
   // 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) {
       display::Displays mirroring_display_list =
           Shell::GetInstance()
               ->display_manager()
               ->software_mirroring_display_list();
       int index = display::FindDisplayIndexContainingPoint(
           mirroring_display_list, point_in_unified_host);
       if (index >= 0) {
         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;
         }
       }
     }
   }
 
   // A native event may not exist in unit test.
   if (!event->HasNativeEvent())
     return false;
 
   gfx::Point point_in_native =
@@ skipping 63 matching lines @@
       in_first_edge ? display_list[0].id() : display_list[1].id();
   AshWindowTreeHost* target_ash_host =
       GetMirroringAshWindowTreeHostForDisplayId(
           in_first_edge ? display_list[1].id() : display_list[0].id());
   MoveCursorTo(target_ash_host, point_in_unified_host,
                update_mouse_location_now);
   return true;
 }
 
 }  // namespace ash