More ApplicationDelegate/ApplicationRunner[Chromium] conversion.

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_delegate.h"
-#include "mojo/public/cpp/application/application_impl.h"
-#include "mojo/public/cpp/application/application_runner.h"
+#include "mojo/public/cpp/application/application_impl_base.h"
 #include "mojo/public/cpp/application/connect.h"
+#include "mojo/public/cpp/application/run_application.h"
 #include "mojo/public/cpp/application/service_provider_impl.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 {
@@ skipping 14 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 {
+class BankApp : public mojo::ApplicationImplBase {
  public:
   BankApp() {}
 
-  void Initialize(mojo::ApplicationImpl* app) override {
-    mojo::ConnectToService(app->shell(), "mojo:principal_service",
+  // ApplicationImplBase overrides:
+  void OnInitialize() override {
+    mojo::ConnectToService(shell(), "mojo:principal_service",
                            GetProxy(&login_service_));
   }
 
-  // From ApplicationDelegate
-  bool ConfigureIncomingConnection(
+  bool OnAcceptConnection(
       mojo::ServiceProviderImpl* service_provider_impl) override {
     std::string url = service_provider_impl->connection_context().remote_url;
     if (url.length() > 0) {
       vanadium::AppInstanceNamePtr app(vanadium::AppInstanceName::New());
       app->url = url;
       std::string user;
       login_service_->GetUser(app.Pass(), BankUser(&user));
       // Check and see whether we got a valid user blessing.
       if (!login_service_.WaitForIncomingResponse()) {
         MOJO_LOG(INFO) << "Failed to get a valid user blessing";
@@ skipping 17 matching lines @@
 
  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);
+  examples::BankApp bank_app;
+  return mojo::RunMainApplication(application_request, &bank_app);
 }