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

services/ui/service.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef SERVICES_UI_SERVICE_H_
 #define SERVICES_UI_SERVICE_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 56 matching lines @@
       public service_manager::InterfaceFactory<mojom::Clipboard>,
       public service_manager::InterfaceFactory<mojom::DisplayManager>,
       public service_manager::InterfaceFactory<mojom::Gpu>,
       public service_manager::InterfaceFactory<mojom::IMERegistrar>,
       public service_manager::InterfaceFactory<mojom::IMEServer>,
       public service_manager::InterfaceFactory<mojom::UserAccessManager>,
       public service_manager::InterfaceFactory<mojom::UserActivityMonitor>,
       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> {
  public:
   Service();
   ~Service() override;
 
  private:
   // Holds InterfaceRequests received before the first WindowTreeHost Display
   // has been established.
@@ skipping 59 matching lines @@
 
   // service_manager::InterfaceFactory<mojom::WindowManagerWindowTreeFactory>
   // implementation.
   void Create(const service_manager::Identity& remote_identity,
               mojom::WindowManagerWindowTreeFactoryRequest request) override;
 
   // service_manager::InterfaceFactory<mojom::WindowTreeFactory>:
   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>:
   void Create(const service_manager::Identity& remote_identity,
               discardable_memory::mojom::DiscardableSharedMemoryManagerRequest
                   request) override;
 
   // service_manager::InterfaceFactory<mojom::WindowServerTest> implementation.
   void Create(const service_manager::Identity& remote_identity,
               mojom::WindowServerTestRequest request) override;
@@ skipping 24 matching lines @@
 
   std::unique_ptr<discardable_memory::DiscardableSharedMemoryManager>
       discardable_shared_memory_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(Service);
 };
 
 }  // namespace ui
 
 #endif  // SERVICES_UI_SERVICE_H_