Move kInvalidDisplayID to display_constants.h.

ui/display/display.h

 // Copyright (c) 2012 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.
 
 #ifndef UI_DISPLAY_DISPLAY_H_
 #define UI_DISPLAY_DISPLAY_H_
 
 #include <stdint.h>
 
 #include "base/compiler_specific.h"
 #include "ui/display/display_export.h"
+#include "ui/display/types/display_constants.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/icc_profile.h"
 
 #if !defined(OS_IOS)
 #include "mojo/public/cpp/bindings/struct_traits.h"  // nogncheck
 #endif
 
 namespace display {
 
 #if !defined(OS_IOS)
@@ skipping 36 matching lines @@
     ROTATION_SOURCE_UNKNOWN,
   };
 
   // Touch support for the display.
   enum TouchSupport {
     TOUCH_SUPPORT_UNKNOWN,
     TOUCH_SUPPORT_AVAILABLE,
     TOUCH_SUPPORT_UNAVAILABLE,
   };
 
-  enum : int64_t { kInvalidDisplayID = -1 };
+  // Use display::kInvalidDisplayId from display_constants.h in new code.
+  // TODO(kylechar): Delete after all references are gone.
+  enum : int64_t { kInvalidDisplayID = display::kInvalidDisplayId };
 
-  // Creates a display with kInvalidDisplayID as default.
+  // Creates a display with kInvalidDisplayId as default.
   Display();
   explicit Display(int64_t id);
   Display(int64_t id, const gfx::Rect& bounds);
   Display(const Display& other);
   ~Display();
 
   // Returns the forced device scale factor, which is given by
   // "--force-device-scale-factor".
   static float GetForcedDeviceScaleFactor();
 
@@ skipping 56 matching lines @@
   // |work_area_insets| and the bounds.
   void UpdateWorkAreaFromInsets(const gfx::Insets& work_area_insets);
 
   // Returns the display's size in pixel coordinates.
   gfx::Size GetSizeInPixel() const;
 
   // Returns a string representation of the display;
   std::string ToString() const;
 
   // True if the display contains valid display id.
-  bool is_valid() const { return id_ != kInvalidDisplayID; }
+  bool is_valid() const { return id_ != kInvalidDisplayId; }
 
   // True if the display corresponds to internal panel.
   bool IsInternal() const;
 
   // Gets/Sets an id of display corresponding to internal panel.
   static int64_t InternalDisplayId();
   static void SetInternalDisplayId(int64_t internal_display_id);
 
   // Test if the |id| is for the internal display if any.
   static bool IsInternalDisplayId(int64_t id);
@@ skipping 48 matching lines @@
 
 #if !defined(OS_IOS)
   friend struct mojo::StructTraits<display::mojom::DisplayDataView,
                                    display::Display>;
 #endif
 };
 
 }  // namespace display
 
 #endif  // UI_DISPLAY_DISPLAY_H_