Add name to services

mojo/public/cpp/application/application.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_PUBLIC_APPLICATION_APPLICATION_H_
 #define MOJO_PUBLIC_APPLICATION_APPLICATION_H_
 #include <vector>
 
 #include "mojo/public/cpp/application/connect.h"
 #include "mojo/public/cpp/application/lib/service_connector.h"
@@ skipping 60 matching lines @@
   explicit Application(MojoHandle service_provider_handle);
   virtual ~Application();
 
   // Override this to do any necessary initialization. There's no need to call
   // Application's implementation.
   // The service_provider will be bound to its pipe before this is called.
   virtual void Initialize();
 
   template <typename Impl, typename Context>
   void AddService(Context* context) {
-    AddServiceConnector(new internal::ServiceConnector<Impl, Context>(context));
+    AddServiceConnector(
+        new internal::ServiceConnector<Impl, Context>(Impl::Name_, context));
   }
 
   template <typename Impl>
   void AddService() {
-    AddServiceConnector(new internal::ServiceConnector<Impl, void>(NULL));
+    AddServiceConnector(
+        new internal::ServiceConnector<Impl, void>(Impl::Name_, NULL));
   }
 
   template <typename Interface>
   void ConnectTo(const std::string& url,
                  InterfacePtr<Interface>* ptr) {
     mojo::ConnectToService(service_provider(), url, ptr);
   }
 
   ServiceProvider* service_provider() { return service_provider_.get(); }
   void BindServiceProvider(ScopedMessagePipeHandle service_provider_handle);
 
  protected:
   // ServiceProvider methods.
   // Override this to dispatch to correct service when there's more than one.
   // TODO(davemoore): Augment this with name registration.
   virtual void ConnectToService(const mojo::String& url,
+                                const mojo::String& name,
                                 ScopedMessagePipeHandle client_handle)
       MOJO_OVERRIDE;
 
  private:
   friend MojoResult (::MojoMain)(MojoHandle);
 
   // Implement this method to create the specific subclass of Application.
   static Application* Create();
 
   // internal::ServiceConnectorBase::Owner methods.
   // Takes ownership of |service_connector|.
   virtual void AddServiceConnector(
       internal::ServiceConnectorBase* service_connector) MOJO_OVERRIDE;
   virtual void RemoveServiceConnector(
       internal::ServiceConnectorBase* service_connector) MOJO_OVERRIDE;
 
-  typedef std::vector<internal::ServiceConnectorBase*> ServiceConnectorList;
-  ServiceConnectorList service_connectors_;
+  typedef std::map<std::string, internal::ServiceConnectorBase*>
+      NameToServiceConnectorMap;
+  NameToServiceConnectorMap name_to_service_connector_;
 };
 
 }  // namespace mojo
 
 #endif  // MOJO_PUBLIC_APPLICATION_APPLICATION_H_