Add place holder to move gfx::Display/Screen to ui/display

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>
 
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
-#include "ui/gfx/display.h"
+#include "ui/display/display.h"
 #include "ui/gfx/geometry/insets.h"
 
 namespace display {
 namespace  {
 
 // DisplayPlacement Positions
 const char kTop[] = "top";
 const char kRight[] = "right";
 const char kBottom[] = "bottom";
 const char kLeft[] = "left";
@@ skipping 16 matching lines @@
       [id](const gfx::Display& display) { return display.id() == id; });
   return &(*iter);
 }
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // DisplayPlacement
 
 DisplayPlacement::DisplayPlacement()
-    : display_id(gfx::Display::kInvalidDisplayID),
-      parent_display_id(gfx::Display::kInvalidDisplayID),
+    : display_id(display::Display::kInvalidDisplayID),
+      parent_display_id(display::Display::kInvalidDisplayID),
       position(DisplayPlacement::RIGHT),
       offset(0) {}
 
 DisplayPlacement::DisplayPlacement(Position pos, int offset)
-    : display_id(gfx::Display::kInvalidDisplayID),
-      parent_display_id(gfx::Display::kInvalidDisplayID),
+    : display_id(display::Display::kInvalidDisplayID),
+      parent_display_id(display::Display::kInvalidDisplayID),
       position(pos),
       offset(offset) {
   DCHECK_LE(TOP, position);
   DCHECK_GE(LEFT, position);
   // Set the default value to |position| in case position is invalid.  DCHECKs
   // above doesn't stop in Release builds.
   if (TOP > position || LEFT < position)
     this->position = RIGHT;
 
   DCHECK_GE(kMaxValidOffset, abs(offset));
@@ skipping 20 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 != gfx::Display::kInvalidDisplayID)
+  if (display_id != display::Display::kInvalidDisplayID)
     s << "id=" << display_id << ", ";
-  if (parent_display_id != gfx::Display::kInvalidDisplayID)
+  if (parent_display_id != display::Display::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 35 matching lines @@
 
   return false;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // DisplayLayout
 
 DisplayLayout::DisplayLayout()
     : mirrored(false),
       default_unified(true),
-      primary_id(gfx::Display::kInvalidDisplayID) {}
+      primary_id(display::Display::kInvalidDisplayID) {}
 
 DisplayLayout::~DisplayLayout() {}
 
 void DisplayLayout::ApplyToDisplayList(DisplayList* 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 == gfx::Display::kInvalidDisplayID) {
+    if (placement.display_id == display::Display::kInvalidDisplayID) {
       LOG(ERROR) << "display_id is not initialized";
       return false;
     }
-    if (placement.parent_display_id == gfx::Display::kInvalidDisplayID) {
+    if (placement.parent_display_id == display::Display::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 115 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