Update display::Display::kInvalidDisplayID constant.

ash/display/extended_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/extended_mouse_warp_controller.h"
 
 #include <cmath>
 
 #include "ash/display/display_util.h"
 #include "ash/display/shared_display_edge_indicator.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "base/memory/ptr_util.h"
 #include "ui/aura/window.h"
 #include "ui/display/manager/display_layout.h"
 #include "ui/display/manager/display_manager.h"
 #include "ui/display/manager/display_manager_utilities.h"
 #include "ui/display/screen.h"
+#include "ui/display/types/display_constants.h"
 #include "ui/events/event_utils.h"
 #include "ui/wm/core/coordinate_conversion.h"
 
 namespace ash {
 
 namespace {
 
 // Maximum size on the display edge that initiate snapping phantom window,
 // from the corner of the display.
 const int kMaximumSnapHeight = 16;
@@ skipping 66 matching lines @@
   CHECK_EQ(b_display_id_, id);
   return b_indicator_bounds_;
 }
 
 ExtendedMouseWarpController::ExtendedMouseWarpController(
     aura::Window* drag_source)
     : drag_source_root_(drag_source), allow_non_native_event_(false) {
   display::DisplayManager* display_manager =
       Shell::GetInstance()->display_manager();
   int64_t drag_source_id = drag_source ? GetDisplayIdFromWindow(drag_source)
-                                       : display::Display::kInvalidDisplayID;
+                                       : display::kInvalidDisplayId;
   display::Displays display_list = display_manager->active_display_list();
   // Try to create a Warp region for all possible two displays combination.
   // The following code does it by poping the last element in the list
   // and then pairing with remaining displays in the list, until the list
   // becomes single element.
   while (display_list.size() > 1) {
     display::Display display = display_list.back();
     display_list.pop_back();
     for (const display::Display& peer : display_list) {
       std::unique_ptr<WarpRegion> region =
@@ skipping 81 matching lines @@
 
   return false;
 }
 
 std::unique_ptr<ExtendedMouseWarpController::WarpRegion>
 ExtendedMouseWarpController::CreateWarpRegion(const display::Display& a,
                                               const display::Display& b,
                                               int64_t drag_source_id) {
   gfx::Rect a_edge;
   gfx::Rect b_edge;
-  int snap_barrier = drag_source_id == display::Display::kInvalidDisplayID
-                         ? 0
-                         : kMaximumSnapHeight;
+  int snap_barrier =
+      drag_source_id == display::kInvalidDisplayId ? 0 : kMaximumSnapHeight;
 
   if (!display::ComputeBoundary(a, b, &a_edge, &b_edge))
     return nullptr;
 
   // Creates the snap window barrirer only when horizontally connected.
   if (a_edge.height() > a_edge.width()) {
     if (drag_source_id == a.id())
       AdjustSourceEdgeBounds(a.bounds(), snap_barrier, &a_edge);
     else if (drag_source_id == b.id())
       AdjustSourceEdgeBounds(b.bounds(), snap_barrier, &b_edge);
   }
 
   return base::MakeUnique<WarpRegion>(a.id(), b.id(), a_edge, b_edge);
 }
 
 }  // namespace ash