Rename gfx::Display/Screen to display::Display/Screen in ui/display, ui/ozon

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 18 matching lines @@
 // to change this value in case to support even larger displays.
 const int kMaxValidOffset = 10000;
 
 bool IsIdInList(int64_t id, const DisplayIdList& list) {
   const auto iter =
       std::find_if(list.begin(), list.end(),
                    [id](int64_t display_id) { return display_id == id; });
   return iter != list.end();
 }
 
-gfx::Display* FindDisplayById(DisplayList* display_list, int64_t id) {
+display::Display* FindDisplayById(DisplayList* display_list, int64_t id) {
   auto iter = std::find_if(
       display_list->begin(), display_list->end(),
-      [id](const gfx::Display& display) { return display.id() == id; });
+      [id](const display::Display& display) { return display.id() == id; });
   return &(*iter);
 }
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // DisplayPlacement
 
 DisplayPlacement::DisplayPlacement()
     : display_id(display::Display::kInvalidDisplayID),
@@ skipping 229 matching lines @@
                      return placement.display_id == display_id;
                    });
   return (iter == placement_list.end()) ? DisplayPlacement()
                                         : DisplayPlacement(*iter);
 }
 
 // static
 bool DisplayLayout::ApplyDisplayPlacement(const DisplayPlacement& placement,
                                           DisplayList* display_list,
                                           int minimum_offset_overlap) {
-  const gfx::Display& parent_display =
+  const display::Display& parent_display =
       *FindDisplayById(display_list, placement.parent_display_id);
   DCHECK(parent_display.is_valid());
-  gfx::Display* target_display =
+  display::Display* target_display =
       FindDisplayById(display_list, placement.display_id);
   gfx::Rect old_bounds(target_display->bounds());
   DCHECK(target_display);
 
   const gfx::Rect& parent_bounds = parent_display.bounds();
   const gfx::Rect& target_bounds = target_display->bounds();
   gfx::Point new_target_origin = parent_bounds.origin();
 
   DisplayPlacement::Position position = placement.position;
 
@@ skipping 29 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