Relocate display_manager from ash to ui

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>
 #include <memory>
 #include <vector>
 
 #include "ash/ash_export.h"
-#include "ash/display/display_manager.h"
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_tree_host_observer.h"
+#include "ui/display/manager/display_manager.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/native_widget_types.h"
 
 namespace aura {
 class Window;
 namespace client {
 class ScreenPositionClient;
 }
 }
 
 namespace display {
 class Display;
+class DisplayManager;

[kylechar, 2016/10/24 14:55:15]

The forward def isn't needed with the include.

[rjkroege, 2016/10/25 23:30:26]

Done.

 class ManagedDisplayInfo;
 }
 
 namespace ui {
 class Reflector;
 }
 
 namespace ash {
 class AshWindowTreeHost;
 class RootWindowTransformer;
@@ skipping 47 matching lines @@
   // tree host will be deleted in an another task on UI thread. This is
   // necessary to safely delete the WTH that is currently handling input events.
   void Close(bool delay_host_deletion);
 
   void CloseAndDeleteHost(MirroringHostInfo* host_info,
                           bool delay_host_deletion);
 
   typedef std::map<int64_t, MirroringHostInfo*> MirroringHostInfoMap;
   MirroringHostInfoMap mirroring_host_info_map_;
 
-  DisplayManager::MultiDisplayMode multi_display_mode_;
+  display::DisplayManager::MultiDisplayMode multi_display_mode_;
 
   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_