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

ash/wm/aura/wm_window_aura.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 ASH_WM_AURA_WM_WINDOW_AURA_H_
 #define ASH_WM_AURA_WM_WINDOW_AURA_H_
 
 #include "ash/wm/common/wm_window.h"
 #include "base/macros.h"
 #include "base/observer_list.h"
@@ skipping 29 matching lines @@
   // WmWindow:
   const WmWindow* GetRootWindow() const override;
   WmRootWindowController* GetRootWindowController() override;
   WmGlobals* GetGlobals() const override;
   void SetName(const std::string& name) override;
   void SetShellWindowId(int id) override;
   int GetShellWindowId() override;
   WmWindow* GetChildByShellWindowId(int id) override;
   ui::wm::WindowType GetType() const override;
   ui::Layer* GetLayer() override;
-  gfx::Display GetDisplayNearestWindow() override;
+  display::Display GetDisplayNearestWindow() override;
   bool HasNonClientArea() override;
   int GetNonClientComponent(const gfx::Point& location) override;
   gfx::Point ConvertPointToTarget(const WmWindow* target,
                                   const gfx::Point& point) const override;
   gfx::Point ConvertPointToScreen(const gfx::Point& point) const override;
   gfx::Point ConvertPointFromScreen(const gfx::Point& point) const override;
   gfx::Rect ConvertRectToScreen(const gfx::Rect& rect) const override;
   gfx::Rect ConvertRectFromScreen(const gfx::Rect& rect) const override;
   gfx::Size GetMinimumSize() const override;
   gfx::Size GetMaximumSize() const override;
@@ skipping 15 matching lines @@
   void SetVisibilityAnimationType(int type) override;
   void SetVisibilityAnimationDuration(base::TimeDelta delta) override;
   void Animate(::wm::WindowAnimationType type) override;
   void SetBounds(const gfx::Rect& bounds) override;
   void SetBoundsWithTransitionDelay(const gfx::Rect& bounds,
                                     base::TimeDelta delta) override;
   void SetBoundsDirect(const gfx::Rect& bounds) override;
   void SetBoundsDirectAnimated(const gfx::Rect& bounds) override;
   void SetBoundsDirectCrossFade(const gfx::Rect& bounds) override;
   void SetBoundsInScreen(const gfx::Rect& bounds_in_screen,
-                         const gfx::Display& dst_display) override;
+                         const display::Display& dst_display) override;
   gfx::Rect GetBoundsInScreen() const override;
   const gfx::Rect& GetBounds() const override;
   gfx::Rect GetTargetBounds() override;
   void ClearRestoreBounds() override;
   void SetRestoreBoundsInScreen(const gfx::Rect& bounds) override;
   gfx::Rect GetRestoreBoundsInScreen() const override;
   void OnWMEvent(const wm::WMEvent* event) override;
   bool Contains(const WmWindow* other) const override;
   void SetShowState(ui::WindowShowState show_state) override;
   ui::WindowShowState GetShowState() const override;
@@ skipping 45 matching lines @@
 
   base::ObserverList<WmWindowObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(WmWindowAura);
 };
 
 }  // namespace wm
 }  // namespace ash
 
 #endif  // ASH_WM_AURA_WM_WINDOW_AURA_H_