Mojo: Use InterfaceFactory<Interface> for service registration

mojo/examples/browser/browser.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 "base/basictypes.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "mojo/examples/window_manager/window_manager.mojom.h"
 #include "mojo/public/cpp/application/application_connection.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/services/public/cpp/geometry/geometry_type_converters.h"
 #include "mojo/services/public/cpp/view_manager/node.h"
 #include "mojo/services/public/cpp/view_manager/view.h"
 #include "mojo/services/public/cpp/view_manager/view_manager.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/public/cpp/view_manager/view_observer.h"
 #include "mojo/services/public/interfaces/navigation/navigation.mojom.h"
 #include "mojo/views/native_widget_view_manager.h"
 #include "mojo/views/views_init.h"
 #include "ui/aura/client/focus_client.h"
 #include "ui/aura/window.h"
 #include "ui/events/event.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/textfield/textfield.h"
@@ skipping 118 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(KeyboardManager);
 };
 
 // This is the basics of creating a views widget with a textfield.
 // TODO: cleanup!
 class Browser : public ApplicationDelegate,
                 public view_manager::ViewManagerDelegate,
                 public views::TextfieldController,
                 public view_manager::NodeObserver {
  public:
-  Browser() : view_manager_(NULL), root_(NULL), widget_(NULL) {}
+  Browser()
+      : view_manager_(NULL),
+        view_manager_client_factory_(this),
+        root_(NULL),
+        widget_(NULL) {}
 
   virtual ~Browser() {
   }
 
  private:
   // Overridden from ApplicationDelegate:
   virtual void Initialize(ApplicationImpl* app) MOJO_OVERRIDE {
     views_init_.reset(new ViewsInit);
     app->ConnectToService("mojo:mojo_window_manager", &navigator_host_);
     app->ConnectToService("mojo:mojo_window_manager", &window_manager_);
  }
 
   virtual bool ConfigureIncomingConnection(ApplicationConnection* connection)
       MOJO_OVERRIDE {
-    view_manager::ViewManager::ConfigureIncomingConnection(connection, this);
+    connection->AddServiceFactory(&view_manager_client_factory_);
     return true;
   }
 
   void CreateWidget(view_manager::Node* node) {
     views::Textfield* textfield = new views::Textfield;
     textfield->set_controller(this);
 
     views::WidgetDelegateView* widget_delegate = new views::WidgetDelegateView;
     widget_delegate->GetContentsView()->set_background(
         views::Background::CreateSolidBackground(SK_ColorBLUE));
@@ skipping 59 matching lines @@
       focus_client->FocusWindow(widget_->GetNativeView());
   }
   virtual void OnNodeDestroyed(view_manager::Node* node) OVERRIDE {
     DCHECK_EQ(root_, node);
     node->RemoveObserver(this);
   }
 
   scoped_ptr<ViewsInit> views_init_;
 
   view_manager::ViewManager* view_manager_;
+  view_manager::ViewManagerClientFactory view_manager_client_factory_;
   view_manager::Node* root_;
   views::Widget* widget_;
   navigation::NavigatorHostPtr navigator_host_;
   IWindowManagerPtr window_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(Browser);
 };
 
 }  // namespace examples
 
 // static
 ApplicationDelegate* ApplicationDelegate::Create() {
   return new examples::Browser;
 }
 
 }  // namespace mojo