Move kInvalidDisplayID to display_constants.h.

ui/views/mus/screen_mus.cc

 // Copyright 2016 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.
 
 // This has to be before any other includes, else default is picked up.
 // See base/logging for details on this.
 #define NOTIMPLEMENTED_POLICY 5
 
 #include "ui/views/mus/screen_mus.h"
 
@@ skipping 96 matching lines @@
       WindowManagerFrameValues frame_values =
           ws_displays[i]
               ->frame_decoration_values.To<WindowManagerFrameValues>();
       WindowManagerFrameValues::SetInstance(frame_values);
     }
   }
 
   DCHECK(display_list().GetPrimaryDisplayIterator() !=
          display_list().displays().end());
 
-  if (internal_display_id != display::Display::kInvalidDisplayID)
+  if (internal_display_id != display::kInvalidDisplayId)
     display::Display::SetInternalDisplayId(internal_display_id);
 
   DCHECK(!display_list().displays().empty());
 }
 
 void ScreenMus::OnDisplaysChanged(
     std::vector<ui::mojom::WsDisplayPtr> ws_displays) {
   for (size_t i = 0; i < ws_displays.size(); ++i) {
     const display::Display& display = ws_displays[i]->display;
     const bool is_primary =
@@ skipping 10 matching lines @@
   }
 }
 
 void ScreenMus::OnDisplayRemoved(int64_t display_id) {
   display_list().RemoveDisplay(display_id);
 }
 
 void ScreenMus::OnPrimaryDisplayChanged(int64_t primary_display_id) {
   // TODO(kylechar): DisplayList would need to change to handle having no
   // primary display.
-  if (primary_display_id == display::Display::kInvalidDisplayID)
+  if (primary_display_id == display::kInvalidDisplayId)
     return;
 
   ProcessDisplayChanged(*display_list().FindDisplayById(primary_display_id),
                         true);
 }
 
 }  // namespace views