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

ash/display/mirror_window_controller.cc

 // 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.
 
 #include "ash/display/mirror_window_controller.h"
 
 #include <utility>
 
 #if defined(USE_X11)
+#include <X11/extensions/XInput2.h>
 #include <X11/Xlib.h>
-#include <X11/extensions/XInput2.h>
 
 // Xlib.h defines RootWindow.
 #undef RootWindow
 #endif
 
 #include "ash/display/cursor_window_controller.h"
 #include "ash/display/display_info.h"
 #include "ash/display/display_manager.h"
 #include "ash/display/root_window_transformers.h"
 #include "ash/display/screen_position_controller.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/host/ash_window_tree_host.h"
 #include "ash/host/ash_window_tree_host_init_params.h"
 #include "ash/host/root_window_transformer.h"
 #include "ash/root_window_settings.h"
 #include "ash/shell.h"
 #include "base/strings/stringprintf.h"
 #include "base/thread_task_runner_handle.h"
 #include "ui/aura/client/capture_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/layout.h"
 #include "ui/compositor/reflector.h"
 #include "ui/display/manager/display_layout.h"
+#include "ui/display/screen.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/native_widget_types.h"
-#include "ui/gfx/screen.h"
 
 #if defined(USE_X11)
 #include "ui/gfx/x/x11_types.h"  // nogncheck
 #endif
 
 namespace ash {
 namespace {
 
 #if defined(USE_X11)
 // Mirror window shouldn't handle input events.
@@ skipping 14 matching lines @@
 class MirroringScreenPositionClient
     : public aura::client::ScreenPositionClient {
  public:
   explicit MirroringScreenPositionClient(MirrorWindowController* controller)
       : controller_(controller) {}
 
   void ConvertPointToScreen(const aura::Window* window,
                             gfx::Point* point) override {
     const aura::Window* root = window->GetRootWindow();
     aura::Window::ConvertPointToTarget(window, root, point);
-    const gfx::Display& display = controller_->GetDisplayForRootWindow(root);
+    const display::Display& display =
+        controller_->GetDisplayForRootWindow(root);
     const gfx::Point display_origin = display.bounds().origin();
     point->Offset(display_origin.x(), display_origin.y());
   }
 
   void ConvertPointFromScreen(const aura::Window* window,
                               gfx::Point* point) override {
     const aura::Window* root = window->GetRootWindow();
-    const gfx::Display& display = controller_->GetDisplayForRootWindow(root);
+    const display::Display& display =
+        controller_->GetDisplayForRootWindow(root);
     const gfx::Point display_origin = display.bounds().origin();
     point->Offset(-display_origin.x(), -display_origin.y());
     aura::Window::ConvertPointToTarget(root, window, point);
   }
 
   void ConvertHostPointToScreen(aura::Window* root_window,
                                 gfx::Point* point) override {
     aura::Window* not_used;
     ScreenPositionController::ConvertHostPointToRelativeToRootWindow(
         root_window, controller_->GetAllRootWindows(), point, &not_used);
     ConvertPointToScreen(root_window, point);
   }
 
   void SetBounds(aura::Window* window,
                  const gfx::Rect& bounds,
-                 const gfx::Display& display) override {
+                 const display::Display& display) override {
     NOTREACHED();
   }
 
  private:
   MirrorWindowController* controller_;  // not owned.
 
   DISALLOW_COPY_AND_ASSIGN(MirroringScreenPositionClient);
 };
 
 class NoneCaptureClient : public aura::client::CaptureClient {
@@ skipping 45 matching lines @@
 
 MirrorWindowController::~MirrorWindowController() {
   // Make sure the root window gets deleted before cursor_window_delegate.
   Close(false);
 }
 
 void MirrorWindowController::UpdateWindow(
     const std::vector<DisplayInfo>& display_info_list) {
   static int mirror_host_count = 0;
   DisplayManager* display_manager = Shell::GetInstance()->display_manager();
-  const gfx::Display& primary = gfx::Screen::GetScreen()->GetPrimaryDisplay();
+  const display::Display& primary =
+      display::Screen::GetScreen()->GetPrimaryDisplay();
   const DisplayInfo& source_display_info =
       display_manager->GetDisplayInfo(primary.id());
 
   multi_display_mode_ = GetCurrentMultiDisplayMode();
 
   for (const DisplayInfo& display_info : display_info_list) {
     std::unique_ptr<RootWindowTransformer> transformer;
     if (display_manager->IsInMirrorMode()) {
       transformer.reset(CreateRootWindowTransformerForMirroredDisplay(
           source_display_info, display_info));
     } else if (display_manager->IsInUnifiedMode()) {
-      gfx::Display display =
+      display::Display display =
           display_manager->GetMirroringDisplayById(display_info.id());
       transformer.reset(CreateRootWindowTransformerForUnifiedDesktop(
           primary.bounds(), display));
     } else {
       NOTREACHED();
     }
 
     if (mirroring_host_info_map_.find(display_info.id()) ==
         mirroring_host_info_map_.end()) {
       AshWindowTreeHostInitParams init_params;
@@ skipping 22 matching lines @@
         DisableInput(host->GetAcceleratedWidget());
 #endif
 
 #if defined(OS_CHROMEOS)
       if (display_manager->IsInUnifiedMode()) {
         host_info->ash_host->ConfineCursorToRootWindow();
         AshWindowTreeHost* unified_ash_host =
             Shell::GetInstance()
                 ->window_tree_host_manager()
                 ->GetAshWindowTreeHostForDisplayId(
-                    gfx::Screen::GetScreen()->GetPrimaryDisplay().id());
+                    display::Screen::GetScreen()->GetPrimaryDisplay().id());
         unified_ash_host->RegisterMirroringHost(host_info->ash_host.get());
         aura::client::SetScreenPositionClient(host->window(),
                                               screen_position_client_.get());
       }
 #endif
 
       aura::client::SetCaptureClient(host->window(), new NoneCaptureClient());
       host->Show();
 
       aura::Window* mirror_window = host_info->mirror_window =
@@ skipping 89 matching lines @@
 aura::Window* MirrorWindowController::GetWindow() {
   DisplayManager* display_manager = Shell::GetInstance()->display_manager();
   if (!display_manager->IsInMirrorMode() || mirroring_host_info_map_.empty())
     return nullptr;
   DCHECK_EQ(1U, mirroring_host_info_map_.size());
   return mirroring_host_info_map_.begin()
       ->second->ash_host->AsWindowTreeHost()
       ->window();
 }
 
-gfx::Display MirrorWindowController::GetDisplayForRootWindow(
+display::Display MirrorWindowController::GetDisplayForRootWindow(
     const aura::Window* root) const {
   for (const auto& pair : mirroring_host_info_map_) {
     if (pair.second->ash_host->AsWindowTreeHost()->window() == root) {
       // Sanity check to catch an error early.
       int64_t id = pair.first;
       const display::DisplayList& list =
           Shell::GetInstance()
               ->display_manager()
               ->software_mirroring_display_list();
       auto iter = std::find_if(
           list.begin(), list.end(),
-          [id](const gfx::Display& display) { return display.id() == id; });
+          [id](const display::Display& display) { return display.id() == id; });
       DCHECK(iter != list.end());
       if (iter != list.end())
         return *iter;
     }
   }
-  return gfx::Display();
+  return display::Display();
 }
 
 AshWindowTreeHost* MirrorWindowController::GetAshWindowTreeHostForDisplayId(
     int64_t id) {
   CHECK_EQ(1u, mirroring_host_info_map_.count(id));
   return mirroring_host_info_map_[id]->ash_host.get();
 }
 
 aura::Window::Windows MirrorWindowController::GetAllRootWindows() const {
   aura::Window::Windows root_windows;
@@ skipping 21 matching lines @@
   // EventProcessor may be accessed after this call if the mirroring window
   // was deleted as a result of input event (e.g. shortcut), so don't delete
   // now.
   if (delay_host_deletion)
     base::ThreadTaskRunnerHandle::Get()->DeleteSoon(FROM_HERE, host_info);
   else
     delete host_info;
 }
 
 }  // namespace ash