Mojo: Use InterfaceFactory<Interface> for service registration

mojo/examples/embedded_app/embedded_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 "base/basictypes.h"
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_number_conversions.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/interface_factory_with_context.h"
 #include "mojo/services/public/cpp/view_manager/node.h"
 #include "mojo/services/public/cpp/view_manager/node_observer.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 "ui/events/event_constants.h"
 #include "url/gurl.h"
 #include "url/url_util.h"
 
 using mojo::view_manager::Node;
 using mojo::view_manager::NodeObserver;
 using mojo::view_manager::View;
 using mojo::view_manager::ViewManager;
 using mojo::view_manager::ViewManagerDelegate;
+using mojo::view_manager::ViewManagerClientFactory;
 using mojo::view_manager::ViewObserver;
 
 namespace mojo {
 namespace examples {
+class EmbeddedApp;
+
+class Navigator : public InterfaceImpl<navigation::Navigator> {
+ public:
+  explicit Navigator(EmbeddedApp* app) : app_(app) {}
+
+ private:
+  virtual void Navigate(
+      uint32 node_id,
+      navigation::NavigationDetailsPtr navigation_details,
+      navigation::ResponseDetailsPtr response_details) OVERRIDE;
+
+  EmbeddedApp* app_;
+  DISALLOW_COPY_AND_ASSIGN(Navigator);
+};
 
 class EmbeddedApp : public ApplicationDelegate,
                     public ViewManagerDelegate,
                     public ViewObserver,
-                    public NodeObserver {
+                    public NodeObserver,
+                    public InterfaceFactoryWithContext<Navigator, EmbeddedApp> {
  public:
-  EmbeddedApp() : view_manager_(NULL) {
+  EmbeddedApp()
+      : InterfaceFactoryWithContext(this),
+        view_manager_(NULL),
+        view_manager_client_factory_(this) {
     url::AddStandardScheme("mojo");
   }
   virtual ~EmbeddedApp() {}
 
   void SetNodeColor(uint32 node_id, SkColor color) {
     pending_node_colors_[node_id] = color;
     ProcessPendingNodeColor(node_id);
   }
 
  private:
-  class Navigator : public InterfaceImpl<navigation::Navigator> {
-   public:
-    Navigator(ApplicationConnection* connection,
-              EmbeddedApp* app) : app_(app) {}
-   private:
-    virtual void Navigate(
-        uint32 node_id,
-        navigation::NavigationDetailsPtr navigation_details,
-        navigation::ResponseDetailsPtr response_details) OVERRIDE {
-      GURL url(navigation_details->url.To<std::string>());
-      if (!url.is_valid()) {
-        LOG(ERROR) << "URL is invalid.";
-        return;
-      }
-      // TODO(aa): Verify new URL is same origin as current origin.
-      SkColor color = 0x00;
-      if (!base::HexStringToUInt(url.path().substr(1), &color)) {
-        LOG(ERROR) << "Invalid URL, path not convertible to integer";
-        return;
-      }
-      app_->SetNodeColor(node_id, color);
-    }
-    EmbeddedApp* app_;
-    DISALLOW_COPY_AND_ASSIGN(Navigator);
-  };
 
   // Overridden from ApplicationDelegate:
   virtual void Initialize(ApplicationImpl* app) MOJO_OVERRIDE {
     // TODO(aa): Weird for embeddee to talk to embedder by URL. Seems like
     // embedder should be able to specify the SP embeddee receives, then
     // communication can be anonymous.
     app->ConnectToService("mojo:mojo_window_manager", &navigator_host_);
   }
 
   virtual bool ConfigureIncomingConnection(ApplicationConnection* connection)
       MOJO_OVERRIDE {
-    ViewManager::ConfigureIncomingConnection(connection, this);
-    connection->AddService<Navigator>(this);
+    connection->AddService(&view_manager_client_factory_);
+    connection->AddService(this);
     return true;
   }
 
   // Overridden from ViewManagerDelegate:
   virtual void OnRootAdded(ViewManager* view_manager, Node* root) OVERRIDE {
     View* view = View::Create(view_manager);
     view->AddObserver(this);
     root->SetActiveView(view);
     root->AddObserver(this);
 
@@ skipping 42 matching lines @@
     if (color == pending_node_colors_.end())
       return;
 
     root->second->active_view()->SetColor(color->second);
     pending_node_colors_.erase(color);
   }
 
   view_manager::ViewManager* view_manager_;
   navigation::NavigatorHostPtr navigator_host_;
   std::map<Node*, View*> views_to_reap_;
+  ViewManagerClientFactory view_manager_client_factory_;
 
   typedef std::map<view_manager::Id, Node*> RootMap;
   RootMap roots_;
 
   // We can receive navigations for nodes we don't have yet.
   typedef std::map<uint32, SkColor> PendingNodeColors;
   PendingNodeColors pending_node_colors_;
 
   DISALLOW_COPY_AND_ASSIGN(EmbeddedApp);
 };
 
+void Navigator::Navigate(uint32 node_id,
+                         navigation::NavigationDetailsPtr navigation_details,
+                         navigation::ResponseDetailsPtr response_details) {
+  GURL url(navigation_details->url.To<std::string>());
+  if (!url.is_valid()) {
+    LOG(ERROR) << "URL is invalid.";
+    return;
+  }
+  // TODO(aa): Verify new URL is same origin as current origin.
+  SkColor color = 0x00;
+  if (!base::HexStringToUInt(url.path().substr(1), &color)) {
+    LOG(ERROR) << "Invalid URL, path not convertible to integer";
+    return;
+  }
+  app_->SetNodeColor(node_id, color);
+}
+
 }  // namespace examples
 
 // static
 ApplicationDelegate* ApplicationDelegate::Create() {
   return new examples::EmbeddedApp;
 }
 
 }  // namespace mojo