ApplicationConnection devolution, part 2.1.

examples/bank_app/bank.cc

 // Copyright 2015 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 <memory>
 
 #include "examples/bank_app/bank.mojom.h"
 #include "mojo/common/binding_set.h"
 #include "mojo/public/c/system/main.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/application_runner.h"
 #include "mojo/public/cpp/application/connect.h"
-#include "mojo/public/cpp/application/interface_factory.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "mojo/public/cpp/utility/run_loop.h"
 #include "mojo/services/vanadium/security/interfaces/principal.mojom.h"
 
 namespace examples {
 
 using vanadium::PrincipalServicePtr;
 
 class BankImpl : public Bank {
  public:
@@ skipping 13 matching lines @@
   void Run(const vanadium::UserPtr& user) const {
     user_->clear();
     if (user) {
       *user_ = user->email;
     }
   }
  private:
   std::string *user_;
 };
 
-class BankApp : public mojo::ApplicationDelegate,
-                public mojo::InterfaceFactory<Bank> {
+class BankApp : public mojo::ApplicationDelegate {
  public:
   BankApp() {}
 
   void Initialize(mojo::ApplicationImpl* app) override {
     mojo::ConnectToService(app->shell(), "mojo:principal_service",
                            GetProxy(&login_service_));
   }
 
   // From ApplicationDelegate
   bool ConfigureIncomingConnection(
@@ skipping 11 matching lines @@
         return false;
       }
       // Record user access to the bank and reject customers that
       // don't have a user identity.
       if (user.empty()) {
         MOJO_LOG(INFO) << "Rejecting customer without a user identity";
         return false;
       }
       MOJO_LOG(INFO) << "Customer " << user << " accessing bank";
     }
-    connection->AddService(this);
+    connection->GetServiceProviderImpl().AddService<Bank>(
+        [this](const mojo::ConnectionContext& connection_context,
+               mojo::InterfaceRequest<Bank> bank_request) {
+          bindings_.AddBinding(&bank_impl_, bank_request.Pass());
+        });
     return true;
   }
 
-  void Create(const mojo::ConnectionContext& connection_context,
-              mojo::InterfaceRequest<Bank> request) override {
-    bindings_.AddBinding(&bank_impl_, request.Pass());
-  }
-
  private:
   BankImpl bank_impl_;
   mojo::BindingSet<Bank> bindings_;
   vanadium::PrincipalServicePtr login_service_;
 };
 
 }  // namespace examples
 
 MojoResult MojoMain(MojoHandle application_request) {
   mojo::ApplicationRunner runner(
       std::unique_ptr<examples::BankApp>(new examples::BankApp()));
   return runner.Run(application_request);
 }