c++ / mojo changes for 'external window mode'

services/ui/ws/window_tree_host_factory.h

Index: services/ui/ws/window_tree_host_factory.h
diff --git a/services/ui/ws/window_tree_host_factory.h b/services/ui/ws/window_tree_host_factory.h
index 0fa3d514e6935dc884864eaa9f070cb5d7a71e2c..1614813769f4518124d67644579aa1f76b55255d 100644
--- a/services/ui/ws/window_tree_host_factory.h
+++ b/services/ui/ws/window_tree_host_factory.h
@@ -16,24 +16,32 @@ namespace ui {
 namespace ws {
 
 class WindowServer;
+class WindowTree;
 
 class WindowTreeHostFactory : public mojom::WindowTreeHostFactory {
  public:
   WindowTreeHostFactory(WindowServer* window_server, const UserId& user_id);
   ~WindowTreeHostFactory() override;
 
-  void AddBinding(mojom::WindowTreeHostFactoryRequest request);
+  void Init(mojom::WindowTreeHostFactoryRequest request,
+            mojom::WindowTreeRequest tree_request,
+            mojom::WindowTreeClientPtr tree_client);
+
+  WindowTree* window_tree() { return tree_; }
 
  private:
   // mojom::WindowTreeHostFactory implementation.
-  void CreateWindowTreeHost(mojom::WindowTreeHostRequest host,
-                            mojom::WindowTreeClientPtr tree_client) override;
+  void CreateWindowTreeHost(
+      mojom::WindowTreeHostRequest tree_host_request) override;
 
   WindowServer* window_server_;
   const UserId user_id_;
   PlatformDisplayInitParams platform_display_init_params_;
   mojo::BindingSet<mojom::WindowTreeHostFactory> bindings_;
 
+  // Owned by WindowServer.
+  WindowTree* tree_ = nullptr;
+
   DISALLOW_COPY_AND_ASSIGN(WindowTreeHostFactory);
 };