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

services/ui/ws/window_tree.h

Index: services/ui/ws/window_tree.h
diff --git a/services/ui/ws/window_tree.h b/services/ui/ws/window_tree.h
index 7bb3106f2b93db999857d127d59c3ce754f77ec5..1d0c0c6e9608bfad7b1a6ef13ffad947f23729e9 100644
--- a/services/ui/ws/window_tree.h
+++ b/services/ui/ws/window_tree.h
@@ -149,10 +149,20 @@ class WindowTree : public mojom::WindowTree,
   WindowServer* window_server() { return window_server_; }
   const WindowServer* window_server() const { return window_server_; }
 
+  void WillCreateRootDisplay(uint32_t transport_window_id) {
+    pending_client_id_ = transport_window_id;
+  }
+
+  // Calls WindowTreeClient::OnEmbed.
+  void DoOnEmbed(mojom::WindowTreePtr tree, ServerWindow* root);
+
   // Called from ~WindowServer. Reset WindowTreeClient so that it no longer gets
   // any messages.
   void PrepareForWindowServerShutdown();
 
+  // Adds a new root to this tree.
+  void AddRoot(const ServerWindow* root);
+
   // Adds a new root to this tree. This is only valid for window managers.
   void AddRootForWindowManager(const ServerWindow* root);
 
@@ -582,6 +592,8 @@ class WindowTree : public mojom::WindowTree,
       waiting_for_top_level_window_info_;
   bool embedder_intercepts_events_ = false;
 
+  uint32_t pending_client_id_ = kInvalidClientId;
+
   DISALLOW_COPY_AND_ASSIGN(WindowTree);
 };