Change mojo demo apps to use Application.

mojo/public/shell/service.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_SHELL_SERVICE_H_
 #define MOJO_PUBLIC_SHELL_SERVICE_H_
 
 #include <vector>
 
 #include "mojo/public/bindings/error_handler.h"
@@ skipping 135 matching lines @@
     service_factory_ = service_factory;
     client_.reset(
         MakeScopedHandle(
             InterfaceHandle<typename ServiceInterface::_Peer>(
                 client_handle.release().value())).Pass(),
         this,
         &reaper_);
   }
 
   Context* context() const { return service_factory_->context(); }
+  Shell* GetShell() { return service_factory_->GetShell(); }

[darin (slow to review), 2014/02/13 00:05:39]

hmm, it'd be nice if GetShell() could just be shell(). Maybe they both can.

perhaps the RemotePtr<Shell> instance that lives on Application should just be a
member of ServiceFactoryBase::Owner. there's no real need for a virtual function
to access shell_.

   typename ServiceInterface::_Peer* client() { return client_.get(); }
 
  private:
   // The Reaper class allows us to handle errors on the client proxy without
   // polluting the name space of the Service<> class.
   class Reaper : public ErrorHandler {
    public:
     Reaper(Service<ServiceInterface, ServiceImpl, Context>* service)
         : service_(service) {}
     virtual void OnError() {
       service_->service_factory_->RemoveService(
           static_cast<ServiceImpl*>(service_));
     }
    private:
     Service<ServiceInterface, ServiceImpl, Context>* service_;
   };
   friend class ServiceFactory<ServiceImpl, Context>;
   Reaper reaper_;
   ServiceFactory<ServiceImpl, Context>* service_factory_;
   RemotePtr<typename ServiceInterface::_Peer> client_;
 };
 
 }  // namespace mojo
 
 #endif  // MOJO_PUBLIC_SHELL_SERVICE_H_