Unified Desktop: hook up ash to allow unified desktop mode

ash/display/display_controller.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 <map>
 #include <vector>
 
@@ skipping 88 matching lines @@
   // Add/Remove observers.
   void AddObserver(Observer* observer);
   void RemoveObserver(Observer* observer);
 
   // Returns the root window for primary display.
   aura::Window* GetPrimaryRootWindow();
 
   // Returns the root window for |display_id|.
   aura::Window* GetRootWindowForDisplayId(int64 id);
 
+  AshWindowTreeHost* GetAshWindowTreeHostForDisplayId(int64 id);
+
   // Toggle mirror mode.
   void ToggleMirrorMode();
 
   // Swap primary and secondary display.
   void SwapPrimaryDisplay();
 
   // Sets the ID of the primary display.  If the display is not connected, it
   // will switch the primary display when connected.
   void SetPrimaryDisplayId(int64 id);
 
@@ skipping 27 matching lines @@
   // gfx::DisplayObserver overrides:
   void OnDisplayAdded(const gfx::Display& display) override;
   void OnDisplayRemoved(const gfx::Display& display) override;
   void OnDisplayMetricsChanged(const gfx::Display& display,
                                uint32_t metrics) override;
 
   // aura::WindowTreeHostObserver overrides:
   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;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(DisplayControllerTest, BoundsUpdated);
   FRIEND_TEST_ALL_PREFIXES(DisplayControllerTest, SecondaryDisplayLayout);
   friend class DisplayManager;
   friend class MirrorWindowController;
 
   // Creates a WindowTreeHost for |display| and stores it in the
   // |window_tree_hosts_| map.
   AshWindowTreeHost* AddWindowTreeHostForDisplay(
       const gfx::Display& display,
       const AshWindowTreeHostInitParams& params);
 
   void OnFadeOutForSwapDisplayFinished();
 
   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();
 
     // Sets how long the throttling should last.
     void SetThrottleTimeout(int64 throttle_ms);
 
     bool IsThrottled() const;
 
    private:
@@ skipping 34 matching lines @@
   int64 cursor_display_id_for_restore_;
 
   base::WeakPtrFactory<DisplayController> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DisplayController);
 };
 
 }  // namespace ash
 
 #endif  // ASH_DISPLAY_DISPLAY_CONTROLLER_H_