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

ash/display/mirror_window_controller.h

 // Copyright (c) 2013 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_DISPLAY_MIRROR_WINDOW_CONTROLLER_H_
 #define ASH_DISPLAY_MIRROR_WINDOW_CONTROLLER_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 14 matching lines @@
 class Window;
 namespace client {
 class ScreenPositionClient;
 }
 }
 
 namespace gfx {
 class Display;
 }
 
+namespace display {
+using Display = gfx::Display;
+}
+
 namespace ui {
 class Reflector;
 }
 
 namespace ash {
 class AshWindowTreeHost;
 class DisplayInfo;
 class RootWindowTransformer;
 
 namespace test{
@@ skipping 19 matching lines @@
   // Close the mirror window if they're not necessary any longer.
   void CloseIfNotNecessary();
 
   // aura::WindowTreeHostObserver overrides:
   void OnHostResized(const aura::WindowTreeHost* host) override;
 
   // Return the root window used to mirror the content. NULL if the
   // display is not mirrored by the compositor path.
   aura::Window* GetWindow();
 
-  // Returns the gfx::Display for the mirroring root window.
-  gfx::Display GetDisplayForRootWindow(const aura::Window* root) const;
+  // Returns the display::Display for the mirroring root window.
+  display::Display GetDisplayForRootWindow(const aura::Window* root) const;
 
   // Returns the AshWindwoTreeHost created for |display_id|.
   AshWindowTreeHost* GetAshWindowTreeHostForDisplayId(int64_t display_id);
 
   // Returns all root windows hosting mirroring displays.
   aura::Window::Windows GetAllRootWindows() const;
 
  private:
   friend class test::MirrorWindowTestApi;
 
@@ skipping 15 matching lines @@
   std::unique_ptr<aura::client::ScreenPositionClient> screen_position_client_;
 
   std::unique_ptr<ui::Reflector> reflector_;
 
   DISALLOW_COPY_AND_ASSIGN(MirrorWindowController);
 };
 
 }  // namespace ash
 
 #endif  // ASH_DISPLAY_MIRROR_WINDOW_CONTROLLER_H_