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

ash/wm/common/wm_window.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_COMMON_WM_WINDOW_H_
 #define ASH_WM_COMMON_WM_WINDOW_H_
 
 #include <memory>
 #include <vector>
 
 #include "ash/ash_export.h"
 #include "base/time/time.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/wm/core/window_animations.h"
 #include "ui/wm/public/window_types.h"
 
 namespace gfx {
 class Display;
 class Point;
 class Rect;
 class Size;
 }
 
+namespace display {
+using Display = gfx::Display;
+}
+
 namespace ui {
 class Layer;
 }
 
 namespace views {
 class Widget;
 }
 
 namespace ash {
 namespace wm {
@@ skipping 29 matching lines @@
   // See wm_shell_window_ids.h for list of known ids.
   virtual void SetShellWindowId(int id) = 0;
   virtual int GetShellWindowId() = 0;
   virtual WmWindow* GetChildByShellWindowId(int id) = 0;
 
   virtual ui::wm::WindowType GetType() const = 0;
 
   // TODO(sky): seems like this shouldn't be exposed.
   virtual ui::Layer* GetLayer() = 0;
 
-  virtual gfx::Display GetDisplayNearestWindow() = 0;
+  virtual display::Display GetDisplayNearestWindow() = 0;
 
   virtual bool HasNonClientArea() = 0;
   virtual int GetNonClientComponent(const gfx::Point& location) = 0;
 
   virtual gfx::Point ConvertPointToTarget(const WmWindow* target,
                                           const gfx::Point& point) const = 0;
   virtual gfx::Point ConvertPointToScreen(const gfx::Point& point) const = 0;
   virtual gfx::Point ConvertPointFromScreen(const gfx::Point& point) const = 0;
   virtual gfx::Rect ConvertRectToScreen(const gfx::Rect& rect) const = 0;
   virtual gfx::Rect ConvertRectFromScreen(const gfx::Rect& rect) const = 0;
@@ skipping 43 matching lines @@
   virtual void Animate(::wm::WindowAnimationType type) = 0;
 
   virtual void SetBounds(const gfx::Rect& bounds) = 0;
   virtual void SetBoundsWithTransitionDelay(const gfx::Rect& bounds,
                                             base::TimeDelta delta) = 0;
   // Sets the bounds in such a way that LayoutManagers are circumvented.
   virtual void SetBoundsDirect(const gfx::Rect& bounds) = 0;
   virtual void SetBoundsDirectAnimated(const gfx::Rect& bounds) = 0;
   virtual void SetBoundsDirectCrossFade(const gfx::Rect& bounds) = 0;
   virtual void SetBoundsInScreen(const gfx::Rect& bounds_in_screen,
-                                 const gfx::Display& dst_display) = 0;
+                                 const display::Display& dst_display) = 0;
   virtual gfx::Rect GetBoundsInScreen() const = 0;
   virtual const gfx::Rect& GetBounds() const = 0;
   virtual gfx::Rect GetTargetBounds() = 0;
 
   virtual void ClearRestoreBounds() = 0;
   virtual void SetRestoreBoundsInScreen(const gfx::Rect& bounds) = 0;
   virtual gfx::Rect GetRestoreBoundsInScreen() const = 0;
 
   virtual void OnWMEvent(const wm::WMEvent* event) = 0;
 
@@ skipping 53 matching lines @@
   virtual void RemoveObserver(WmWindowObserver* observer) = 0;
 
  protected:
   virtual ~WmWindow() {}
 };
 
 }  // namespace wm
 }  // namespace ash
 
 #endif  // ASH_WM_COMMON_WM_WINDOW_H_