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

ash/display/display_configuration_controller.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_DISPLAY_DISPLAY_CONFIGURATION_CONTROLLER_H_
 #define ASH_DISPLAY_DISPLAY_CONFIGURATION_CONTROLLER_H_
 
 #include <memory>
 
 #include "ash/ash_export.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
-#include "ui/gfx/display.h"
+#include "ui/display/display.h"
 
 namespace display {
 class DisplayLayout;
 }
 
 namespace ash {
 
 namespace test {
 class ShellTestApi;
 }  // namespace test
@@ skipping 19 matching lines @@
   // display.  TODO(oshima/stevenjb): Support 3+ displays.
   void SetDisplayLayout(std::unique_ptr<display::DisplayLayout> layout,
                         bool user_action);
 
   // Sets the mirror mode with a fade-in/fade-out animation. Affects all
   // displays.
   void SetMirrorMode(bool mirror, bool user_action);
 
   // Sets the display's rotation with animation if available.
   void SetDisplayRotation(int64_t display_id,
-                          gfx::Display::Rotation rotation,
-                          gfx::Display::RotationSource source,
+                          display::Display::Rotation rotation,
+                          display::Display::RotationSource source,
                           bool user_action);
 
   // Sets the primary display id.
   void SetPrimaryDisplayId(int64_t display_id, bool user_action);
 
   // WindowTreeHostManager::Observer
   void OnDisplayConfigurationChanged() override;
 
  protected:
   friend class ash::test::ShellTestApi;
@@ skipping 18 matching lines @@
   std::unique_ptr<DisplayChangeLimiter> limiter_;
 
   base::WeakPtrFactory<DisplayConfigurationController> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DisplayConfigurationController);
 };
 
 }  // namespace ash
 
 #endif  // ASH_DISPLAY_DISPLAY_CONFIGURATION_CONTROLLER_H_