Relocate display_manager from ash to ui

ash/display/window_tree_host_manager.h

 // Copyright (c) 2012 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_CONTROLLER_H_
 #define ASH_DISPLAY_DISPLAY_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/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/time/time.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_tree_host_observer.h"
 #include "ui/base/ime/input_method.h"
 #include "ui/base/ime/input_method_delegate.h"
 #include "ui/display/display_observer.h"
+#include "ui/display/manager/display_manager.h"
 #include "ui/gfx/geometry/point.h"
 
 namespace aura {
 class WindowTreeHost;
 }
 
 namespace base {
 class Value;
 template <typename T>
 class JSONValueConverter;
 }
 
 namespace gfx {
 class Insets;
 }
 
 namespace ash {
 class AshWindowTreeHost;
 struct AshWindowTreeHostInitParams;
 class CursorWindowController;
-class DisplayManager;
 class FocusActivationStore;
 class InputMethodEventHandler;
 class MirrorWindowController;
 class RootWindowController;
 
 // WindowTreeHostManager owns and maintains RootWindows for each attached
 // display, keeping them in sync with display configuration changes.
 class ASH_EXPORT WindowTreeHostManager
     : public display::DisplayObserver,
       public aura::WindowTreeHostObserver,
-      public DisplayManager::Delegate,
+      public display::DisplayManager::Delegate,
       public ui::internal::InputMethodDelegate {
  public:
   // TODO(oshima): Consider moving this to display::DisplayObserver.
   class ASH_EXPORT Observer {
    public:
     // Invoked only once after all displays are initialized
     // after startup.
     virtual void OnDisplaysInitialized() {}
 
     // Invoked when the display configuration change is requested,
@@ skipping 82 matching lines @@
 
   // display::DisplayObserver overrides:
   void OnDisplayAdded(const display::Display& display) override;
   void OnDisplayRemoved(const display::Display& display) override;
   void OnDisplayMetricsChanged(const display::Display& display,
                                uint32_t metrics) override;
 
   // aura::WindowTreeHostObserver overrides:
   void OnHostResized(const aura::WindowTreeHost* host) override;
 
-  // ash::DisplayManager::Delegate overrides:
+  // display::DisplayManager::Delegate overrides:
   void CreateOrUpdateMirroringDisplay(
-      const DisplayInfoList& info_list) override;
+      const display::DisplayInfoList& info_list) override;
   void CloseMirroringDisplayIfNotNecessary() override;
   void PreDisplayConfigurationChange(bool clear_focus) override;
-  void PostDisplayConfigurationChange() override;
+  void PostDisplayConfigurationChange(bool must_clear_window) override;
 #if defined(OS_CHROMEOS)
   ui::DisplayConfigurator* display_configurator() override;
 #endif
   std::string GetInternalDisplayNameString() override;
   std::string GetUnknownDisplayNameString() override;
 
   // ui::internal::InputMethodDelegate overrides:
   ui::EventDispatchDetails DispatchKeyEventPostIME(
       ui::KeyEvent* event) override;
 
@@ skipping 47 matching lines @@
   int64_t cursor_display_id_for_restore_;
 
   base::WeakPtrFactory<WindowTreeHostManager> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowTreeHostManager);
 };
 
 }  // namespace ash
 
 #endif  // ASH_DISPLAY_DISPLAY_CONTROLLER_H_