Move kInvalidDisplayID to display_constants.h.

ui/display/manager/display_layout.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/manager/display_layout.h"
 
 #include <algorithm>
 #include <set>
 #include <sstream>
 
@@ skipping 31 matching lines @@
                    [id](const Display& display) { return display.id() == id; });
   return &(*iter);
 }
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // DisplayPlacement
 
 DisplayPlacement::DisplayPlacement()
-    : DisplayPlacement(Display::kInvalidDisplayID,
-                       Display::kInvalidDisplayID,
+    : DisplayPlacement(kInvalidDisplayId,
+                       kInvalidDisplayId,
                        DisplayPlacement::RIGHT,
                        0,
                        DisplayPlacement::TOP_LEFT) {}
 
 DisplayPlacement::DisplayPlacement(Position position, int offset)
-    : DisplayPlacement(Display::kInvalidDisplayID,
-                       Display::kInvalidDisplayID,
+    : DisplayPlacement(kInvalidDisplayId,
+                       kInvalidDisplayId,
                        position,
                        offset,
                        DisplayPlacement::TOP_LEFT) {}
 
 DisplayPlacement::DisplayPlacement(Position position,
                                    int offset,
                                    OffsetReference offset_reference)
-    : DisplayPlacement(Display::kInvalidDisplayID,
-                       Display::kInvalidDisplayID,
+    : DisplayPlacement(kInvalidDisplayId,
+                       kInvalidDisplayId,
                        position,
                        offset,
                        offset_reference) {}
 
 DisplayPlacement::DisplayPlacement(int64_t display_id,
                                    int64_t parent_display_id,
                                    Position position,
                                    int offset,
                                    OffsetReference offset_reference)
     : display_id(display_id),
@@ skipping 33 matching lines @@
       position = RIGHT;
       break;
   }
   offset = -offset;
   std::swap(display_id, parent_display_id);
   return *this;
 }
 
 std::string DisplayPlacement::ToString() const {
   std::stringstream s;
-  if (display_id != Display::kInvalidDisplayID)
+  if (display_id != kInvalidDisplayId)
     s << "id=" << display_id << ", ";
-  if (parent_display_id != Display::kInvalidDisplayID)
+  if (parent_display_id != kInvalidDisplayId)
     s << "parent=" << parent_display_id << ", ";
   s << PositionToString(position) << ", ";
   s << offset;
   return s.str();
 }
 
 // static
 std::string DisplayPlacement::PositionToString(Position position) {
   switch (position) {
     case TOP:
@@ skipping 33 matching lines @@
 
   LOG(ERROR) << "Invalid position value:" << string;
 
   return false;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // DisplayLayout
 
 DisplayLayout::DisplayLayout()
-    : mirrored(false),
-      default_unified(true),
-      primary_id(Display::kInvalidDisplayID) {}
+    : mirrored(false), default_unified(true), primary_id(kInvalidDisplayId) {}
 
 DisplayLayout::~DisplayLayout() {}
 
 void DisplayLayout::ApplyToDisplayList(Displays* display_list,
                                        std::vector<int64_t>* updated_ids,
                                        int minimum_offset_overlap) const {
   // Layout from primary, then dependent displays.
   std::set<int64_t> parents;
   parents.insert(primary_id);
   while (parents.size()) {
@@ skipping 26 matching lines @@
 
   bool has_primary_as_parent = false;
   int64_t id = 0;
 
   for (const auto& placement : layout.placement_list) {
     // Placements are sorted by display_id.
     if (id >= placement.display_id) {
       LOG(ERROR) << "PlacementList must be sorted by display_id";
       return false;
     }
-    if (placement.display_id == Display::kInvalidDisplayID) {
+    if (placement.display_id == kInvalidDisplayId) {
       LOG(ERROR) << "display_id is not initialized";
       return false;
     }
-    if (placement.parent_display_id == Display::kInvalidDisplayID) {
+    if (placement.parent_display_id == kInvalidDisplayId) {
       LOG(ERROR) << "display_parent_id is not initialized";
       return false;
     }
     if (placement.display_id == placement.parent_display_id) {
       LOG(ERROR) << "display_id must not be same as parent_display_id";
       return false;
     }
     if (!IsIdInList(placement.display_id, list)) {
       LOG(ERROR) << "display_id is not in the id list:" << placement.ToString();
       return false;
@@ skipping 120 matching lines @@
 
   gfx::Insets insets = target_display->GetWorkAreaInsets();
   target_display->set_bounds(
       gfx::Rect(new_target_origin, target_bounds.size()));
   target_display->UpdateWorkAreaFromInsets(insets);
 
   return old_bounds != target_display->bounds();
 }
 
 }  // namespace display