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

services/ui/service.h

Index: services/ui/service.h
diff --git a/services/ui/service.h b/services/ui/service.h
index 7bd35c21232f523a1eba0cbdf4525d9c9bfb84cd..cc7f229d5e489ad1f1aedddd23f8367557c5ad15 100644
--- a/services/ui/service.h
+++ b/services/ui/service.h
@@ -74,7 +74,8 @@ class Service
       public service_manager::InterfaceFactory<
           mojom::WindowManagerWindowTreeFactory>,
       public service_manager::InterfaceFactory<mojom::WindowTreeFactory>,
-      public service_manager::InterfaceFactory<mojom::WindowTreeHostFactory>,
+      public service_manager::InterfaceFactory<
+          mojom::WindowTreeHostFactoryRegistrar>,
       public service_manager::InterfaceFactory<
           discardable_memory::mojom::DiscardableSharedMemoryManager>,
       public service_manager::InterfaceFactory<mojom::WindowServerTest> {
@@ -154,9 +155,9 @@ class Service
   void Create(const service_manager::Identity& remote_identity,
               mojom::WindowTreeFactoryRequest request) override;
 
-  // service_manager::InterfaceFactory<mojom::WindowTreeHostFactory>:
+  // service_manager::InterfaceFactory<mojom::WindowTreeHostFactoryRegistrar>:
   void Create(const service_manager::Identity& remote_identity,
-              mojom::WindowTreeHostFactoryRequest request) override;
+              mojom::WindowTreeHostFactoryRegistrarRequest request) override;
 
   // service_manager::InterfaceFactory<
   //    discardable_memory::mojom::DiscardableSharedMemoryManager>: