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

ui/display/manager/display_layout.h

 // 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.
 
 #ifndef UI_DISPLAY_MANAGER_DISPLAY_LAYOUT_H_
 #define UI_DISPLAY_MANAGER_DISPLAY_LAYOUT_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 13 matching lines @@
 class Display;
 }
 
 namespace display {
 using Display = gfx::Display;
 
 // An identifier used to manage display layout in DisplayManager /
 // DisplayLayoutStore.
 using DisplayIdList = std::vector<int64_t>;
 
-using DisplayList = std::vector<gfx::Display>;
+using DisplayList = std::vector<display::Display>;
 
 // DisplayPlacement specifies where the display (D) is placed relative
 // to parent (P) display.  In the following example, the display (D)
 // given by |display_id| is placed at the left side of the parent
 // display (P) given by |parent_display_id|, with a negative offset.
 //
 //        +      +--------+
 // offset |      |        |
 //        +      |   D    +--------+
 //               |        |        |
@@ skipping 75 matching lines @@
   static bool ApplyDisplayPlacement(const DisplayPlacement& placement,
                                     DisplayList* display_list,
                                     int minimum_offset_overlap);
 
   DISALLOW_COPY_AND_ASSIGN(DisplayLayout);
 };
 
 }  // namespace display
 
 #endif  // UI_DISPLAY_MANAGER_DISPLAY_LAYOUT_H_