Mojo: Use InterfaceFactory<Interface> for service registration

mojo/services/window_manager/window_manager_app.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 MOJO_SERVICES_WINDOW_MANAGER_WINDOW_MANAGER_APP_H_
 #define MOJO_SERVICES_WINDOW_MANAGER_WINDOW_MANAGER_APP_H_
 
 #include <set>
 
 #include "base/memory/scoped_ptr.h"
 #include "mojo/aura/window_tree_host_mojo_delegate.h"
 #include "mojo/public/cpp/application/application_delegate.h"
+#include "mojo/public/cpp/application/interface_factory_with_context.h"
 #include "mojo/public/cpp/bindings/string.h"
 #include "mojo/services/public/cpp/view_manager/node_observer.h"
 #include "mojo/services/public/cpp/view_manager/types.h"
+#include "mojo/services/public/cpp/view_manager/view_manager_client_factory.h"
 #include "mojo/services/public/cpp/view_manager/view_manager_delegate.h"
+#include "mojo/services/window_manager/window_manager_service_impl.h"
 #include "ui/aura/client/focus_change_observer.h"
 #include "ui/wm/public/activation_change_observer.h"
 
 namespace aura {
 namespace client {
 class ActivationClient;
 class FocusClient;
 }
 class Window;
 }
 
 namespace wm {
 class ScopedCaptureClient;
 }
 
 namespace mojo {
 
 class AuraInit;
 class WindowManagerServiceImpl;
 class WindowTreeHostMojo;
 
-class WindowManagerApp : public ApplicationDelegate,
-                         public view_manager::ViewManagerDelegate,
-                         public view_manager::NodeObserver,
-                         public WindowTreeHostMojoDelegate,
-                         public aura::client::FocusChangeObserver,
-                         public aura::client::ActivationChangeObserver {
+class WindowManagerApp
+    : public ApplicationDelegate,
+      public view_manager::ViewManagerDelegate,
+      public view_manager::NodeObserver,
+      public WindowTreeHostMojoDelegate,
+      public aura::client::FocusChangeObserver,
+      public aura::client::ActivationChangeObserver,
+      public InterfaceFactoryWithContext<WindowManagerServiceImpl,
+                                         WindowManagerApp> {
  public:
   WindowManagerApp();
   virtual ~WindowManagerApp();
 
   void AddConnection(WindowManagerServiceImpl* connection);
   void RemoveConnection(WindowManagerServiceImpl* connection);
 
   view_manager::Id OpenWindow();
   view_manager::Id OpenWindowWithURL(const String& url);
   void SetCapture(view_manager::Id node);
@@ skipping 37 matching lines @@
   // Creates an aura::Window for every node in the hierarchy beneath |id|,
   // and adds to the registry so that it can be retrieved later via
   // GetWindowForNodeId().
   // TODO(beng): perhaps Node should have a property bag.
   void RegisterSubtree(view_manager::Id id, aura::Window* parent);
   // Deletes the aura::Windows associated with the hierarchy beneath |id|,
   // and removes from the registry.
   void UnregisterSubtree(view_manager::Id id);
 
   view_manager::ViewManager* view_manager_;
+  view_manager::ViewManagerClientFactory view_manager_client_factory_;
   view_manager::Node* root_;
 
   scoped_ptr<AuraInit> aura_init_;
   scoped_ptr<WindowTreeHostMojo> window_tree_host_;
 
   scoped_ptr<wm::ScopedCaptureClient> capture_client_;
   scoped_ptr<aura::client::FocusClient> focus_client_;
   aura::client::ActivationClient* activation_client_;
 
   Connections connections_;
   NodeIdToWindowMap node_id_to_window_map_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowManagerApp);
 };
 
 }  // namespace mojo
 
 #endif  // MOJO_SERVICES_WINDOW_MANAGER_WINDOW_MANAGER_APP_H_