Unified Desktop: hook up ash to allow unified desktop mode

ash/display/display_controller.h

Index: ash/display/display_controller.h
diff --git a/ash/display/display_controller.h b/ash/display/display_controller.h
index 3dc81890101e6dde46bf4b123cb6d44dddae311b..73c339d5302a9cadf1acdd77cb4dc8e4ef07769a 100644
--- a/ash/display/display_controller.h
+++ b/ash/display/display_controller.h
@@ -106,6 +106,8 @@ class ASH_EXPORT DisplayController : public gfx::DisplayObserver,
   // Returns the root window for |display_id|.
   aura::Window* GetRootWindowForDisplayId(int64 id);
 
+  AshWindowTreeHost* GetAshWindowTreeHostForDisplayId(int64 id);
+
   // Toggle mirror mode.
   void ToggleMirrorMode();
 
@@ -153,7 +155,8 @@ class ASH_EXPORT DisplayController : public gfx::DisplayObserver,
   void OnHostResized(const aura::WindowTreeHost* host) override;
 
   // aura::DisplayManager::Delegate overrides:
-  void CreateOrUpdateMirroringDisplay(const DisplayInfo& info) override;
+  void CreateOrUpdateMirroringDisplay(
+      const DisplayInfoList& info_list) override;
   void CloseMirroringDisplay() override;
   void PreDisplayConfigurationChange(bool clear_focus) override;
   void PostDisplayConfigurationChange() override;
@@ -174,6 +177,10 @@ class ASH_EXPORT DisplayController : public gfx::DisplayObserver,
 
   void SetMirrorModeAfterAnimation(bool mirror);
 
+  // Delete the AsWindowTreeHost. This does not remove the entry from
+  // |window_tree_hosts_|. Caller has to explicitly remove it.
+  void DeleteHost(AshWindowTreeHost* host_to_delete);
+
   class DisplayChangeLimiter {
    public:
     DisplayChangeLimiter();