Rename gfx::Display/Screen to display::Display/Screen in ash

ash/wm/aura/wm_window_aura.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 "ash/wm/aura/wm_window_aura.h"
 
 #include "ash/screen_util.h"
 #include "ash/shelf/shelf_util.h"
 #include "ash/wm/aura/aura_layout_manager_adapter.h"
 #include "ash/wm/aura/wm_globals_aura.h"
 #include "ash/wm/aura/wm_root_window_controller_aura.h"
 #include "ash/wm/common/window_state.h"
 #include "ash/wm/common/wm_layout_manager.h"
 #include "ash/wm/common/wm_window_observer.h"
 #include "ash/wm/common/wm_window_property.h"
 #include "ash/wm/window_animations.h"
 #include "ash/wm/window_properties.h"
 #include "ash/wm/window_state_aura.h"
 #include "ash/wm/window_util.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/window_tree_client.h"
 #include "ui/aura/layout_manager.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/aura/window_property.h"
 #include "ui/base/hit_test.h"
 #include "ui/compositor/layer_tree_owner.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
-#include "ui/gfx/screen.h"
+#include "ui/display/screen.h"
 #include "ui/wm/core/coordinate_conversion.h"
 #include "ui/wm/core/window_util.h"
 
 DECLARE_WINDOW_PROPERTY_TYPE(ash::wm::WmWindowAura*);
 
 namespace ash {
 namespace wm {
 
 DEFINE_OWNED_WINDOW_PROPERTY_KEY(ash::wm::WmWindowAura, kWmWindowKey, nullptr);
 
@@ skipping 89 matching lines @@
 }
 
 ui::wm::WindowType WmWindowAura::GetType() const {
   return window_->type();
 }
 
 ui::Layer* WmWindowAura::GetLayer() {
   return window_->layer();
 }
 
-gfx::Display WmWindowAura::GetDisplayNearestWindow() {
-  return gfx::Screen::GetScreen()->GetDisplayNearestWindow(window_);
+display::Display WmWindowAura::GetDisplayNearestWindow() {
+  return display::Screen::GetScreen()->GetDisplayNearestWindow(window_);
 }
 
 bool WmWindowAura::HasNonClientArea() {
   return window_->delegate() ? true : false;
 }
 
 int WmWindowAura::GetNonClientComponent(const gfx::Point& location) {
   return window_->delegate()
              ? window_->delegate()->GetNonClientComponent(location)
              : HTNOWHERE;
@@ skipping 176 matching lines @@
   bool old_on_top = (old_bounds.width() > bounds.width());
   if (old_on_top)
     old_layer->parent()->StackBelow(new_layer, old_layer);
   else
     old_layer->parent()->StackAbove(new_layer, old_layer);
 
   CrossFadeAnimation(window_, std::move(old_layer_owner), gfx::Tween::EASE_OUT);
 }
 
 void WmWindowAura::SetBoundsInScreen(const gfx::Rect& bounds_in_screen,
-                                     const gfx::Display& dst_display) {
+                                     const display::Display& dst_display) {
   window_->SetBoundsInScreen(bounds_in_screen, dst_display);
 }
 
 gfx::Rect WmWindowAura::GetBoundsInScreen() const {
   return window_->GetBoundsInScreen();
 }
 
 const gfx::Rect& WmWindowAura::GetBounds() const {
   return window_->bounds();
 }
@@ skipping 213 matching lines @@
 }
 
 void WmWindowAura::OnWindowVisibilityChanging(aura::Window* window,
                                               bool visible) {
   FOR_EACH_OBSERVER(WmWindowObserver, observers_,
                     OnWindowVisibilityChanging(this, visible));
 }
 
 }  // namespace wm
 }  // namespace ash