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

ash/root_window_controller.h

Index: ash/root_window_controller.h
diff --git a/ash/root_window_controller.h b/ash/root_window_controller.h
index ddf63555eec1d9a0f134320389c39d83acad223e..580af4f946c2d16f868bf49bd59736410c432e01 100644
--- a/ash/root_window_controller.h
+++ b/ash/root_window_controller.h
@@ -8,6 +8,7 @@
 #include <map>
 
 #include "ash/ash_export.h"
+#include "ash/host/ash_window_tree_host.h"
 #include "ash/shelf/shelf_types.h"
 #include "ash/shell_observer.h"
 #include "ash/system/user/login_status.h"
@@ -47,6 +48,7 @@ class ScopedCaptureClient;
 }
 
 namespace ash {
+class AshWindowTreeHost;
 class ShelfWidget;
 class StackingController;
 class SystemTray;
@@ -83,14 +85,14 @@ class ASH_EXPORT RootWindowController : public ShellObserver {
  public:
 
   // Creates and Initialize the RootWindowController for primary display.
-  static void CreateForPrimaryDisplay(aura::WindowTreeHost* host);
+  static void CreateForPrimaryDisplay(AshWindowTreeHost* host);
 
   // Creates and Initialize the RootWindowController for secondary displays.
-  static void CreateForSecondaryDisplay(aura::WindowTreeHost* host);
+  static void CreateForSecondaryDisplay(AshWindowTreeHost* host);
 
   // Creates and Initialize the RootWindowController for virtual
   // keyboard displays.
-  static void CreateForVirtualKeyboardDisplay(aura::WindowTreeHost* host);
+  static void CreateForVirtualKeyboardDisplay(AshWindowTreeHost* host);
 
   // Returns a RootWindowController that has a shelf for given
   // |window|. This returns the RootWindowController for the |window|'s
@@ -109,10 +111,14 @@ class ASH_EXPORT RootWindowController : public ShellObserver {
 
   virtual ~RootWindowController();
 
-  aura::Window* root_window() { return host_->window(); }
-  const aura::Window* root_window() const { return host_->window(); }
-  aura::WindowTreeHost* host() { return host_.get(); }
-  const aura::WindowTreeHost* host() const { return host_.get(); }
+  aura::Window* root_window() { return host()->window(); }
+  const aura::Window* root_window() const { return host()->window(); }
+  aura::WindowTreeHost* host() { return ash_host_->AsWindowTreeHost(); }
+  const aura::WindowTreeHost* host() const { return ash_host_->AsWindowTreeHost(); }
+
+  AshWindowTreeHost* ash_host() { return ash_host_.get(); }
+  const AshWindowTreeHost* ash_host() const { return ash_host_.get(); }
+  
 
   RootWindowLayoutManager* root_window_layout() { return root_window_layout_; }
 
@@ -235,7 +241,7 @@ class ASH_EXPORT RootWindowController : public ShellObserver {
   void DeactivateKeyboard(keyboard::KeyboardController* keyboard_controller);
 
  private:
-  explicit RootWindowController(aura::WindowTreeHost* host);
+  explicit RootWindowController(AshWindowTreeHost* host);
   enum RootWindowType {
     PRIMARY,
     SECONDARY,
@@ -267,7 +273,7 @@ class ASH_EXPORT RootWindowController : public ShellObserver {
   virtual void OnLoginStateChanged(user::LoginStatus status) OVERRIDE;
   virtual void OnTouchHudProjectionToggled(bool enabled) OVERRIDE;
 
-  scoped_ptr<aura::WindowTreeHost> host_;
+  scoped_ptr<AshWindowTreeHost> ash_host_;
   RootWindowLayoutManager* root_window_layout_;
 
   scoped_ptr<StackingController> stacking_controller_;
@@ -307,7 +313,7 @@ class ASH_EXPORT RootWindowController : public ShellObserver {
 
   scoped_ptr<DesktopBackgroundWidgetController> wallpaper_controller_;
   scoped_ptr<AnimatingDesktopController> animating_wallpaper_controller_;
-  scoped_ptr< ::wm::ScopedCaptureClient> capture_client_;
+  scoped_ptr<::wm::ScopedCaptureClient> capture_client_;
 
   DISALLOW_COPY_AND_ASSIGN(RootWindowController);
 };