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

ash/display/cursor_window_controller.cc

 // Copyright 2014 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/display/cursor_window_controller.h"
 
 #include "ash/display/display_manager.h"
 #include "ash/display/mirror_window_controller.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/base/cursor/cursors_aura.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/compositor/dip_util.h"
 #include "ui/compositor/paint_recorder.h"
+#include "ui/display/display.h"
+#include "ui/display/screen.h"
 #include "ui/gfx/canvas.h"
-#include "ui/gfx/display.h"
 #include "ui/gfx/geometry/dip_util.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/image/image_skia_operations.h"
-#include "ui/gfx/screen.h"
 
 namespace ash {
 
 class CursorWindowDelegate : public aura::WindowDelegate {
  public:
   CursorWindowDelegate() {}
   ~CursorWindowDelegate() override {}
 
   // aura::WindowDelegate overrides:
   gfx::Size GetMinimumSize() const override { return size_; }
@@ skipping 58 matching lines @@
   if (is_cursor_compositing_enabled_ != enabled) {
     is_cursor_compositing_enabled_ = enabled;
     if (display_.is_valid())
       UpdateCursorImage();
     UpdateContainer();
   }
 }
 
 void CursorWindowController::UpdateContainer() {
   if (is_cursor_compositing_enabled_) {
-    gfx::Screen* screen = gfx::Screen::GetScreen();
-    gfx::Display display = screen->GetDisplayNearestPoint(
-        screen->GetCursorScreenPoint());
+    display::Screen* screen = display::Screen::GetScreen();
+    display::Display display =
+        screen->GetDisplayNearestPoint(screen->GetCursorScreenPoint());
     DCHECK(display.is_valid());
     if (display.is_valid())
       SetDisplay(display);
   } else {
     aura::Window* mirror_window = Shell::GetInstance()
                                       ->window_tree_host_manager()
                                       ->mirror_window_controller()
                                       ->GetWindow();
     if (mirror_window)
-      display_ = gfx::Screen::GetScreen()->GetPrimaryDisplay();
+      display_ = display::Screen::GetScreen()->GetPrimaryDisplay();
     SetContainer(mirror_window);
   }
   // Updates the hot point based on the current display.
   UpdateCursorImage();
 }
 
-void CursorWindowController::SetDisplay(const gfx::Display& display) {
+void CursorWindowController::SetDisplay(const display::Display& display) {
   if (!is_cursor_compositing_enabled_)
     return;
 
   // TODO(oshima): Do not updatethe composition cursor when crossing
   // display in unified desktop mode for now. crbug.com/517222.
   if (Shell::GetInstance()->display_manager()->IsInUnifiedMode() &&
       display.id() != DisplayManager::kUnifiedDisplayId) {
     return;
   }
 
@@ skipping 92 matching lines @@
   // TODO(hshi): support custom cursor set.
   if (!ui::GetCursorDataFor(cursor_set_, cursor_type_, cursor_scale,
                             &resource_id, &hot_point_)) {
     return;
   }
   const gfx::ImageSkia* image =
       ResourceBundle::GetSharedInstance().GetImageSkiaNamed(resource_id);
   if (!is_cursor_compositing_enabled_) {
     gfx::ImageSkia rotated = *image;
     switch (display_.rotation()) {
-      case gfx::Display::ROTATE_0:
+      case display::Display::ROTATE_0:
         break;
-      case gfx::Display::ROTATE_90:
+      case display::Display::ROTATE_90:
         rotated = gfx::ImageSkiaOperations::CreateRotatedImage(
             *image, SkBitmapOperations::ROTATION_90_CW);
         hot_point_.SetPoint(
             rotated.width() - hot_point_.y(),
             hot_point_.x());
         break;
-      case gfx::Display::ROTATE_180:
+      case display::Display::ROTATE_180:
         rotated = gfx::ImageSkiaOperations::CreateRotatedImage(
             *image, SkBitmapOperations::ROTATION_180_CW);
         hot_point_.SetPoint(
             rotated.height() - hot_point_.x(),
             rotated.width() - hot_point_.y());
         break;
-      case gfx::Display::ROTATE_270:
+      case display::Display::ROTATE_270:
         rotated = gfx::ImageSkiaOperations::CreateRotatedImage(
             *image, SkBitmapOperations::ROTATION_270_CW);
         hot_point_.SetPoint(
             hot_point_.y(),
             rotated.height() - hot_point_.x());
         break;
     }
     // Note that mirror window's scale factor is always 1.0f, therefore we
     // need to take 2x's image and paint as if it's 1x image.
     const gfx::ImageSkiaRep& image_rep =
@@ skipping 24 matching lines @@
     cursor_window_->Show();
   else
     cursor_window_->Hide();
 }
 
 const gfx::ImageSkia& CursorWindowController::GetCursorImageForTest() const {
   return delegate_->cursor_image();
 }
 
 }  // namespace ash