Converts ash to use aura-mus

ash/mus/root_window_controller.h

Index: ash/mus/root_window_controller.h
diff --git a/ash/mus/root_window_controller.h b/ash/mus/root_window_controller.h
index f1c009f04bb06f372a2cb16a0c7fc3a6bba4ec4e..160a5fee21a925c28faff642dae1aaac48f488f3 100644
--- a/ash/mus/root_window_controller.h
+++ b/ash/mus/root_window_controller.h
@@ -8,10 +8,16 @@
 #include <memory>
 
 #include "ash/mus/disconnected_app_handler.h"
-#include "services/ui/public/cpp/window_observer.h"
 #include "services/ui/public/interfaces/window_manager_constants.mojom.h"
 #include "ui/display/display.h"
 
+namespace aura {
+class WindowTreeHostMus;
+namespace client {
+class WindowParentingClient;
+}
+}
+
 namespace gfx {
 class Insets;
 }
@@ -24,7 +30,6 @@ namespace ash {
 
 namespace mus {
 
-class LayoutManager;
 class WindowManager;
 class WmRootWindowControllerMus;
 class WmShelfMus;
@@ -36,21 +41,24 @@ class WmWindowMus;
 // RootWindowController takes ownership of the Window that it passed to it.

[James Cook, 2016/12/05 19:21:44]

nit: update comment

[sky, 2016/12/05 21:39:20]

Done.

 class RootWindowController {
  public:
-  RootWindowController(WindowManager* window_manager,
-                       ui::Window* root,
-                       const display::Display& display);
+  RootWindowController(
+      WindowManager* window_manager,
+      std::unique_ptr<aura::WindowTreeHostMus> window_tree_host,
+      const display::Display& display);
   ~RootWindowController();
 
   void Shutdown();
 
   service_manager::Connector* GetConnector();
 
-  ui::Window* root() { return root_; }
+  aura::Window* root();
+  const aura::Window* root() const;
   WmRootWindowControllerMus* wm_root_window_controller() {
     return wm_root_window_controller_.get();
   }
 
-  ui::Window* NewTopLevelWindow(
+  aura::Window* NewTopLevelWindow(
+      ui::mojom::WindowType window_type,
       std::map<std::string, std::vector<uint8_t>>* properties);
 
   WmWindowMus* GetWindowByShellWindowId(int id);
@@ -60,6 +68,10 @@ class RootWindowController {
 
   WindowManager* window_manager() { return window_manager_; }
 
+  aura::WindowTreeHostMus* window_tree_host() {
+    return window_tree_host_.get();
+  }
+
   const display::Display& display() const { return display_; }
 
   WmShelfMus* wm_shelf() { return wm_shelf_.get(); }
@@ -68,14 +80,13 @@ class RootWindowController {
   friend class WmTestBase;
   friend class WmTestHelper;
 
-  gfx::Rect CalculateDefaultBounds(ui::Window* window) const;
+  gfx::Rect CalculateDefaultBounds(
+      aura::Window* container_window,
+      const std::map<std::string, std::vector<uint8_t>>* properties) const;
   gfx::Rect GetMaximizedWindowBounds() const;
 
-  // Creates the necessary set of layout managers in the shell windows.
-  void CreateLayoutManagers();
-
   WindowManager* window_manager_;
-  ui::Window* root_;
+  std::unique_ptr<aura::WindowTreeHostMus> window_tree_host_;
   int window_count_ = 0;
 
   display::Display display_;
@@ -83,7 +94,7 @@ class RootWindowController {
   std::unique_ptr<WmRootWindowControllerMus> wm_root_window_controller_;
   std::unique_ptr<WmShelfMus> wm_shelf_;
 
-  std::map<ui::Window*, std::unique_ptr<LayoutManager>> layout_managers_;
+  std::unique_ptr<aura::client::WindowParentingClient> parenting_client_;
 
   std::unique_ptr<DisconnectedAppHandler> disconnected_app_handler_;