Move kInvalidDisplayID to display_constants.h.

ui/display/fake_display_delegate.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.
 
 #include "ui/display/fake_display_delegate.h"
 
 #include <inttypes.h>
 
 #include <string>
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/hash.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/string_split.h"
 #include "base/strings/stringprintf.h"
 #include "ui/display/display.h"
 #include "ui/display/display_switches.h"
+#include "ui/display/types/display_constants.h"
 #include "ui/display/types/native_display_observer.h"
 #include "ui/display/util/display_util.h"
 
 namespace display {
 
 namespace {
 
 // The EDID specification marks the top bit of the manufacturer id as reserved.
 const uint16_t kReservedManufacturerID = 1 << 15;
 
 // A random product name hash.
 const uint32_t kProductCodeHash = base::Hash("Very Generic Display");
 
 }  // namespace
 
 FakeDisplayDelegate::FakeDisplayDelegate() {}
 
 FakeDisplayDelegate::~FakeDisplayDelegate() {}
 
 int64_t FakeDisplayDelegate::AddDisplay(const gfx::Size& display_size) {
   DCHECK(!display_size.IsEmpty());
 
   if (next_display_id_ == 0xFF) {
     LOG(ERROR) << "Exceeded display id limit";
-    return Display::kInvalidDisplayID;
+    return kInvalidDisplayId;
   }
 
   int64_t id = GenerateDisplayID(kReservedManufacturerID, kProductCodeHash,
                                  ++next_display_id_);
 
   FakeDisplaySnapshot::Builder builder;
   builder.SetId(id).SetNativeMode(display_size);
   builder.SetName(base::StringPrintf("Fake Display %" PRId64, id));
 
-  return AddDisplay(builder.Build()) ? id : Display::kInvalidDisplayID;
+  return AddDisplay(builder.Build()) ? id : kInvalidDisplayId;
 }
 
 bool FakeDisplayDelegate::AddDisplay(
     std::unique_ptr<ui::DisplaySnapshot> display) {
   DCHECK(display);
 
   int64_t display_id = display->display_id();
   // Check there is no existing display with the same id.
   for (auto& existing_display : displays_) {
     if (existing_display->display_id() == display_id) {
@@ skipping 160 matching lines @@
 
 void FakeDisplayDelegate::OnConfigurationChanged() {
   if (!initialized_)
     return;
 
   for (ui::NativeDisplayObserver& observer : observers_)
     observer.OnConfigurationChanged();
 }
 
 }  // namespace display