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..0c3a1f864c29deb9e3ee23ee27677bf9b3b197f3 100644
--- a/services/ui/service.h
+++ b/services/ui/service.h
@@ -76,6 +76,8 @@ class Service
       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> {
  public:
@@ -158,6 +160,10 @@ class Service
   void Create(const service_manager::Identity& remote_identity,
               mojom::WindowTreeHostFactoryRequest request) override;
 
+  // service_manager::InterfaceFactory<mojom::WindowTreeHostFactoryRegistrar>:
+  void Create(const service_manager::Identity& remote_identity,
+              mojom::WindowTreeHostFactoryRegistrarRequest request) override;
+
   // service_manager::InterfaceFactory<
   //    discardable_memory::mojom::DiscardableSharedMemoryManager>:
   void Create(const service_manager::Identity& remote_identity,