Relocate display_manager from ash to ui

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>
 
 // Xlib.h defines RootWindow.
 #undef RootWindow
 #endif
 
 #include "ash/display/cursor_window_controller.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/threading/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/manager/display_manager.h"
 #include "ui/display/manager/managed_display_info.h"
 #include "ui/display/screen.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/native_widget_types.h"
 
 #if defined(USE_X11)
 #include "ui/aura/window_tree_host_x11.h"
 #include "ui/gfx/x/x11_types.h"  // nogncheck
 #endif
 
@@ skipping 59 matching lines @@
   void SetCapture(aura::Window* window) override {}
   void ReleaseCapture(aura::Window* window) override {}
   aura::Window* GetCaptureWindow() override { return nullptr; }
   aura::Window* GetGlobalCaptureWindow() override { return nullptr; }
   void AddObserver(aura::client::CaptureClientObserver* observer) override {}
   void RemoveObserver(aura::client::CaptureClientObserver* observer) override {}
 
   DISALLOW_COPY_AND_ASSIGN(NoneCaptureClient);
 };
 
-DisplayManager::MultiDisplayMode GetCurrentMultiDisplayMode() {
-  DisplayManager* display_manager = Shell::GetInstance()->display_manager();
+display::DisplayManager::MultiDisplayMode GetCurrentMultiDisplayMode() {
+  display::DisplayManager* display_manager =
+      Shell::GetInstance()->display_manager();
   return display_manager->IsInUnifiedMode()
-             ? DisplayManager::UNIFIED
-             : (display_manager->IsInMirrorMode() ? DisplayManager::MIRRORING
-                                                  : DisplayManager::EXTENDED);
+             ? display::DisplayManager::UNIFIED
+             : (display_manager->IsInMirrorMode()
+                    ? display::DisplayManager::MIRRORING
+                    : display::DisplayManager::EXTENDED);
 }
 
 }  // namespace
 
 struct MirrorWindowController::MirroringHostInfo {
   MirroringHostInfo();
   ~MirroringHostInfo();
   std::unique_ptr<AshWindowTreeHost> ash_host;
   gfx::Size mirror_window_host_size;
   aura::Window* mirror_window = nullptr;
 };
 
 MirrorWindowController::MirroringHostInfo::MirroringHostInfo() {}
 MirrorWindowController::MirroringHostInfo::~MirroringHostInfo() {}
 
 MirrorWindowController::MirrorWindowController()
-    : multi_display_mode_(DisplayManager::EXTENDED),
+    : multi_display_mode_(display::DisplayManager::EXTENDED),
       screen_position_client_(new MirroringScreenPositionClient(this)) {}
 
 MirrorWindowController::~MirrorWindowController() {
   // Make sure the root window gets deleted before cursor_window_delegate.
   Close(false);
 }
 
 void MirrorWindowController::UpdateWindow(
     const std::vector<display::ManagedDisplayInfo>& display_info_list) {
   static int mirror_host_count = 0;
-  DisplayManager* display_manager = Shell::GetInstance()->display_manager();
+  display::DisplayManager* display_manager =
+      Shell::GetInstance()->display_manager();
   const display::Display& primary =
       display::Screen::GetScreen()->GetPrimaryDisplay();
   const display::ManagedDisplayInfo& source_display_info =
       display_manager->GetDisplayInfo(primary.id());
 
   multi_display_mode_ = GetCurrentMultiDisplayMode();
 
   for (const display::ManagedDisplayInfo& display_info : display_info_list) {
     std::unique_ptr<RootWindowTransformer> transformer;
     if (display_manager->IsInMirrorMode()) {
@@ skipping 91 matching lines @@
       } else {
         ++iter;
       }
     }
   }
 }
 
 void MirrorWindowController::UpdateWindow() {
   if (mirroring_host_info_map_.empty())
     return;
-  DisplayManager* display_manager = Shell::GetInstance()->display_manager();
+  display::DisplayManager* display_manager =
+      Shell::GetInstance()->display_manager();
   std::vector<display::ManagedDisplayInfo> display_info_list;
   for (auto& pair : mirroring_host_info_map_)
     display_info_list.push_back(display_manager->GetDisplayInfo(pair.first));
   UpdateWindow(display_info_list);
 }
 
 void MirrorWindowController::CloseIfNotNecessary() {
-  DisplayManager::MultiDisplayMode new_mode = GetCurrentMultiDisplayMode();
+  display::DisplayManager::MultiDisplayMode new_mode =
+      GetCurrentMultiDisplayMode();
   if (multi_display_mode_ != new_mode)
     Close(true);
   multi_display_mode_ = new_mode;
 }
 
 void MirrorWindowController::Close(bool delay_host_deletion) {
   for (auto& info : mirroring_host_info_map_)
     CloseAndDeleteHost(info.second, delay_host_deletion);
 
   mirroring_host_info_map_.clear();
@@ skipping 17 matching lines @@
       Shell::GetInstance()
           ->window_tree_host_manager()
           ->cursor_window_controller()
           ->UpdateLocation();
       return;
     }
   }
 }
 
 aura::Window* MirrorWindowController::GetWindow() {
-  DisplayManager* display_manager = Shell::GetInstance()->display_manager();
+  display::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();
 }
 
 display::Display MirrorWindowController::GetDisplayForRootWindow(
     const aura::Window* root) const {
@@ skipping 47 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