Mojo: Use InterfaceFactory<Interface> for service registration

mojo/services/window_manager/window_manager_app.cc

 // 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.
 
 #include "mojo/services/window_manager/window_manager_app.h"
 
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
 #include "mojo/aura/aura_init.h"
 #include "mojo/aura/window_tree_host_mojo.h"
 #include "mojo/public/cpp/application/application_connection.h"
 #include "mojo/services/public/cpp/view_manager/node.h"
 #include "mojo/services/public/cpp/view_manager/view_manager.h"
-#include "mojo/services/window_manager/window_manager_service_impl.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_property.h"
 #include "ui/wm/core/capture_controller.h"
 #include "ui/wm/core/focus_controller.h"
 #include "ui/wm/core/focus_rules.h"
 #include "ui/wm/public/activation_client.h"
 
 DECLARE_WINDOW_PROPERTY_TYPE(mojo::view_manager::Node*);
 
 namespace mojo {
@@ skipping 39 matching lines @@
   }
 
   DISALLOW_COPY_AND_ASSIGN(WMFocusRules);
 };
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // WindowManagerApp, public:
 
-WindowManagerApp::WindowManagerApp() : view_manager_(NULL), root_(NULL) {}
+WindowManagerApp::WindowManagerApp()
+    : InterfaceFactoryWithContext(this),
+      view_manager_(NULL),
+      view_manager_client_factory_(this),
+      root_(NULL) {
+}
 WindowManagerApp::~WindowManagerApp() {
   // TODO(beng): Figure out if this should be done in
   //             OnViewManagerDisconnected().
   STLDeleteValues(&node_id_to_window_map_);
   if (focus_client_.get())
     focus_client_->RemoveObserver(this);
   if (activation_client_)
     activation_client_->RemoveObserver(this);
 }
 
@@ skipping 44 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // WindowManagerApp, ApplicationDelegate implementation:
 
 void WindowManagerApp::Initialize(ApplicationImpl* impl) {
   aura_init_.reset(new AuraInit);
 }
 
 bool WindowManagerApp::ConfigureIncomingConnection(
     ApplicationConnection* connection) {
-  connection->AddService<WindowManagerServiceImpl>(this);
-  view_manager::ViewManager::ConfigureIncomingConnection(connection, this);
+  connection->AddService(this);
+  connection->AddService(&view_manager_client_factory_);
   return true;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // WindowManagerApp, view_manager::ViewManagerDelegate implementation:
 
 void WindowManagerApp::OnRootAdded(view_manager::ViewManager* view_manager,
                                    view_manager::Node* root) {
   DCHECK(!view_manager_ && !root_);
   view_manager_ = view_manager;
@@ skipping 121 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // ApplicationDelegate, public:
 
 // static
 ApplicationDelegate* ApplicationDelegate::Create() {
   return new WindowManagerApp;
 }
 
 }  // namespace mojo