| Index: mojo/shell/profile_service_loader.h | 
| diff --git a/mojo/shell/profile_service_loader.h b/mojo/shell/profile_service_loader.h | 
| index bbb5d821d516c4cddc8efe0b162572ccc0109eb1..fac8ca3a22761944a703321344ddefae473b6c84 100644 | 
| --- a/mojo/shell/profile_service_loader.h | 
| +++ b/mojo/shell/profile_service_loader.h | 
| @@ -10,7 +10,9 @@ | 
| #include "base/containers/scoped_ptr_hash_map.h" | 
| #include "base/memory/scoped_ptr.h" | 
| #include "mojo/public/cpp/application/application_delegate.h" | 
| +#include "mojo/public/cpp/application/interface_factory.h" | 
| #include "mojo/service_manager/service_loader.h" | 
| +#include "mojo/services/profile/profile_service_impl.h" | 
|  | 
| namespace mojo { | 
|  | 
| @@ -19,7 +21,9 @@ class ApplicationImpl; | 
| namespace shell { | 
|  | 
| // ServiceLoader responsible for creating connections to the ProfileService. | 
| -class ProfileServiceLoader : public ServiceLoader, public ApplicationDelegate { | 
| +class ProfileServiceLoader : public ServiceLoader, | 
| +                             public ApplicationDelegate, | 
| +                             public InterfaceFactory<ProfileService> { | 
| public: | 
| ProfileServiceLoader(); | 
| virtual ~ProfileServiceLoader(); | 
| @@ -34,11 +38,17 @@ class ProfileServiceLoader : public ServiceLoader, public ApplicationDelegate { | 
| const GURL& url) OVERRIDE; | 
|  | 
| // ApplicationDelegate overrides. | 
| -  virtual bool ConfigureIncomingConnection(ApplicationConnection* connection) | 
| -      MOJO_OVERRIDE; | 
| +  virtual bool ConfigureIncomingConnection( | 
| +      ApplicationConnection* connection) OVERRIDE; | 
| + | 
| +  // InterfaceFactory<ProfileService> overrides. | 
| +  virtual void Create(ApplicationConnection* connection, | 
| +                      InterfaceRequest<ProfileService> request) OVERRIDE; | 
|  | 
| base::ScopedPtrHashMap<uintptr_t, ApplicationImpl> apps_; | 
|  | 
| +  ProfileServiceImpl impl_; | 
| + | 
| DISALLOW_COPY_AND_ASSIGN(ProfileServiceLoader); | 
| }; | 
|  | 
|  |