Introdcue AshWindowTreeHost and move ash/chrome specific code in WTH to ash.

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 19 matching lines @@
 class Value;
 template <typename T> class JSONValueConverter;
 }
 
 namespace gfx {
 class Display;
 class Insets;
 }
 
 namespace ash {
+class AshWindowTreeHost;
 namespace internal {
 class CursorWindowController;
 class DisplayInfo;
 class DisplayManager;
 class FocusActivationStore;
 class MirrorWindowController;
 class RootWindowController;
 class VirtualKeyboardWindowController;
 }
 
@@ skipping 37 matching lines @@
 
   internal::MirrorWindowController* mirror_window_controller() {
     return mirror_window_controller_.get();
   }
 
   internal::VirtualKeyboardWindowController*
       virtual_keyboard_window_controller() {
     return virtual_keyboard_window_controller_.get();
   }
 
-  // Initializes primary display.
-  void InitPrimaryDisplay();
+  void CreatePrimaryHost();
 
-  // Initialize secondary displays.
-  void InitSecondaryDisplays();
+  // Initializes displays.
+  void InitDisplays();
 
   // 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);
@@ skipping 52 matching lines @@
   virtual void PostDisplayConfigurationChange() OVERRIDE;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(DisplayControllerTest, BoundsUpdated);
   FRIEND_TEST_ALL_PREFIXES(DisplayControllerTest, SecondaryDisplayLayout);
   friend class internal::DisplayManager;
   friend class internal::MirrorWindowController;
 
   // Creates a WindowTreeHost for |display| and stores it in the |root_windows_|
   // map.
-  aura::WindowTreeHost* AddWindowTreeHostForDisplay(
+  AshWindowTreeHost* AddWindowTreeHostForDisplay(
       const gfx::Display& display);
 
   void OnFadeOutForSwapDisplayFinished();
 
   void UpdateHostWindowNames();
 
   class DisplayChangeLimiter {
    public:
     DisplayChangeLimiter();
 
     // Sets how long the throttling should last.
     void SetThrottleTimeout(int64 throttle_ms);
 
     bool IsThrottled() const;
 
    private:
     // The time when the throttling ends.
     base::Time throttle_timeout_;
 
     DISALLOW_COPY_AND_ASSIGN(DisplayChangeLimiter);
   };
 
   // The limiter to throttle how fast a user can
   // change the display configuration.
   scoped_ptr<DisplayChangeLimiter> limiter_;
 
-  // The mapping from display ID to its root window.
-  std::map<int64, aura::Window*> root_windows_;
+
+  typedef std::map<int64, AshWindowTreeHost*> WindowTreeHostMap;
+  // The mapping from display ID to its window tree host.
+  WindowTreeHostMap window_tree_hosts_;
 
   ObserverList<Observer> observers_;
 
-  // Store the primary root window temporarily while replacing
+  // Store the primary window tree host temporarily while replacing
   // display.
-  aura::Window* primary_root_window_for_replace_;
+  AshWindowTreeHost* primary_tree_host_for_replace_;
 
   scoped_ptr<internal::FocusActivationStore> focus_activation_store_;
 
   scoped_ptr<internal::CursorWindowController> cursor_window_controller_;
   scoped_ptr<internal::MirrorWindowController> mirror_window_controller_;
   scoped_ptr<internal::VirtualKeyboardWindowController>
       virtual_keyboard_window_controller_;
 
   // Stores the curent cursor location (in native coordinates) used to
   // restore the cursor location when display configuration
   // changed.
   gfx::Point cursor_location_in_native_coords_for_restore_;
 
   DISALLOW_COPY_AND_ASSIGN(DisplayController);
 };
 
 }  // namespace ash
 
 #endif  // ASH_DISPLAY_DISPLAY_CONTROLLER_H_