Mojo: Use InterfaceFactory<Interface> for service registration

mojo/examples/media_viewer/media_viewer.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 <map>
 #include <string>
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/utf_string_conversions.h"
 #include "mojo/examples/media_viewer/media_viewer.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/public/cpp/application/context_interface_factory.h"
 #include "mojo/public/cpp/bindings/interface_impl.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/interfaces/navigation/navigation.mojom.h"
 #include "mojo/views/native_widget_view_manager.h"
 #include "mojo/views/views_init.h"
 #include "skia/ext/platform_canvas.h"
 #include "skia/ext/refptr.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkPaint.h"
@@ skipping 148 matching lines @@
   }
 
   Delegate* delegate_;
   views::Button* buttons_[CONTROL_COUNT];
 
   DISALLOW_COPY_AND_ASSIGN(ControlPanel);
 };
 
 class NavigatorImpl : public InterfaceImpl<navigation::Navigator> {
  public:
-  NavigatorImpl(ApplicationConnection* connection,
-                MediaViewer* viewer) : viewer_(viewer) {}
+  explicit NavigatorImpl(MediaViewer* viewer) : viewer_(viewer) {}
   virtual ~NavigatorImpl() {}
 
  private:
   // Overridden from navigation::Navigate:
   virtual void Navigate(
       uint32_t node_id,
       navigation::NavigationDetailsPtr navigation_details,
       navigation::ResponseDetailsPtr response_details) OVERRIDE;
 
   MediaViewer* viewer_;
 
   DISALLOW_COPY_AND_ASSIGN(NavigatorImpl);
 };
 
 class MediaViewer : public ApplicationDelegate,
                     public view_manager::ViewManagerDelegate,
-                    public ControlPanel::Delegate {
+                    public ControlPanel::Delegate,
+                    public ContextInterfaceFactory<NavigatorImpl, MediaViewer> {
  public:
-  MediaViewer() : app_(NULL),
-                  view_manager_(NULL),
-                  control_node_(NULL),
-                  content_node_(NULL),
-                  control_panel_(this) {
+  MediaViewer()
+      : ContextInterfaceFactory(this),
+        app_(NULL),
+        view_manager_(NULL),
+        view_manager_client_factory_(this),
+        control_node_(NULL),
+        content_node_(NULL),
+        control_panel_(this) {
     handler_map_["image/png"] = "mojo:mojo_png_viewer";
   }
 
   virtual ~MediaViewer() {}
 
   void Navigate(
       uint32_t node_id,
       navigation::NavigationDetailsPtr navigation_details,
       navigation::ResponseDetailsPtr response_details) {
     // TODO(yzshen): This shouldn't be needed once FIFO is ready.
@@ skipping 36 matching lines @@
 
 
   // Overridden from ApplicationDelegate:
   virtual void Initialize(ApplicationImpl* app) OVERRIDE {
     app_ = app;
     views_init_.reset(new ViewsInit);
   }
 
   virtual bool ConfigureIncomingConnection(ApplicationConnection* connection)
       OVERRIDE {
-    connection->AddService<NavigatorImpl>(this);
-    view_manager::ViewManager::ConfigureIncomingConnection(connection, this);
+    connection->AddServiceFactory(this);
+    connection->AddServiceFactory(&view_manager_client_factory_);
     return true;
   }
 
   // Overridden from view_manager::ViewManagerDelegate:
   virtual void OnRootAdded(view_manager::ViewManager* view_manager,
                            view_manager::Node* root) OVERRIDE {
     view_manager_ = view_manager;
 
     control_node_ = view_manager::Node::Create(view_manager_);
     root->AddChild(control_node_);
@@ skipping 42 matching lines @@
   }
 
   std::string GetHandlerForContentType(const std::string& content_type) {
     HandlerMap::const_iterator it = handler_map_.find(content_type);
     return it != handler_map_.end() ? it->second : std::string();
   }
 
   ApplicationImpl* app_;
   scoped_ptr<ViewsInit> views_init_;
   view_manager::ViewManager* view_manager_;
+  view_manager::ViewManagerClientFactory view_manager_client_factory_;
   view_manager::Node* control_node_;
   view_manager::Node* content_node_;
   ControlPanel control_panel_;
   ZoomableMediaPtr zoomable_media_;
   HandlerMap handler_map_;
   scoped_ptr<PendingNavigateRequest> pending_navigate_request_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaViewer);
 };
 
 void NavigatorImpl::Navigate(
     uint32_t node_id,
     navigation::NavigationDetailsPtr navigation_details,
     navigation::ResponseDetailsPtr response_details) {
   viewer_->Navigate(node_id, navigation_details.Pass(),
                     response_details.Pass());
 }
 
 }  // namespace examples
 
 // static
 ApplicationDelegate* ApplicationDelegate::Create() {
   return new examples::MediaViewer;
 }
 
 }  // namespace mojo