Change mojo demo apps to use Application.

mojo/examples/view_manager/view_manager.cc

 // 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.
 
 #include <stdio.h>
 
 #include "base/logging.h"
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop/message_loop.h"
 #include "mojo/public/bindings/allocation_scope.h"
 #include "mojo/public/bindings/remote_ptr.h"
+#include "mojo/public/shell/application.h"
 #include "mojo/public/system/core.h"
 #include "mojo/public/system/macros.h"
 #include "mojo/services/native_viewport/geometry_conversions.h"
 #include "mojom/launcher.h"
 #include "mojom/native_viewport.h"
 #include "mojom/shell.h"
 #include "mojom/view_manager.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/rect.h"
@@ skipping 26 matching lines @@
   virtual void GetId() MOJO_OVERRIDE {
     client_->OnGotId(id_);
   }
 
   int id_;
   RemotePtr<ViewClient> client_;
 
   DISALLOW_COPY_AND_ASSIGN(ViewImpl);
 };
 
-class ViewManagerImpl : public ViewManager,
-                        public ShellClient,
+class ViewManagerImpl : public Service<ViewManager, ViewManagerImpl>,
                         public NativeViewportClient,
                         public LauncherClient {
  public:
-  explicit ViewManagerImpl(ScopedShellHandle shell_handle)
-      : shell_(shell_handle.Pass(), this) {
+  explicit ViewManagerImpl() {
     InitNativeViewport();
   }
 
  private:
   // Overridden from ViewManager:
   virtual void CreateView() MOJO_OVERRIDE {
     InterfacePipe<View> pipe;
     views_.push_back(new ViewImpl(pipe.handle_to_peer.Pass()));
-    client_->OnViewCreated(pipe.handle_to_self.Pass());
-  }
-
-  // Overridden from ShellClient:
-  virtual void AcceptConnection(const mojo::String& url,
-                                ScopedMessagePipeHandle handle) MOJO_OVERRIDE {
-    client_.reset(
-        MakeScopedHandle(
-            ViewManagerClientHandle(handle.release().value())).Pass(),
-        this);
+    client()->OnViewCreated(pipe.handle_to_self.Pass());
   }
 
   // Overridden from NativeViewportClient:
   virtual void OnCreated() OVERRIDE {
   }
   virtual void OnDestroyed() OVERRIDE {
     base::MessageLoop::current()->Quit();
   }
   virtual void OnBoundsChanged(const Rect& bounds) OVERRIDE {
     // TODO(beng):
@@ skipping 14 matching lines @@
   virtual void OnURLEntered(const mojo::String& url) OVERRIDE {
     std::string url_spec = url.To<std::string>();
     printf("Received URL from launcher app: %s\n", url_spec.c_str());
     launcher_->Hide();
   }
 
   void InitNativeViewport() {
     InterfacePipe<NativeViewport, AnyInterface> pipe;
 
     AllocationScope scope;
-    shell_->Connect("mojo:mojo_native_viewport_service",
-                    pipe.handle_to_peer.Pass());
+    shell()->Connect("mojo:mojo_native_viewport_service",
+                     pipe.handle_to_peer.Pass());
 
     native_viewport_.reset(pipe.handle_to_self.Pass(), this);
     native_viewport_->Create(gfx::Rect(50, 50, 800, 600));
     native_viewport_->Show();
   }
 
   void InitLauncher() {
     if (!launcher_.is_null())
       return;
 
     InterfacePipe<Launcher, AnyInterface> pipe;
 
     AllocationScope scope;
-    shell_->Connect("mojo:mojo_launcher", pipe.handle_to_peer.Pass());
+    shell()->Connect("mojo:mojo_launcher", pipe.handle_to_peer.Pass());
 
     launcher_.reset(pipe.handle_to_self.Pass(), this);
   }
 
   void DidCreateContext() {
   }
 
-  RemotePtr<Shell> shell_;
-  RemotePtr<ViewManagerClient> client_;
   ScopedVector<ViewImpl> views_;
   RemotePtr<NativeViewport> native_viewport_;
   RemotePtr<Launcher> launcher_;
 
   DISALLOW_COPY_AND_ASSIGN(ViewManagerImpl);
 };
 
 }  // namespace examples
 }  // namespace mojo
 
 extern "C" VIEW_MANAGER_EXPORT MojoResult CDECL MojoMain(
     MojoHandle shell_handle) {
   base::MessageLoop loop;
-  mojo::examples::ViewManagerImpl view_manager(
-      mojo::MakeScopedHandle(mojo::ShellHandle(shell_handle)).Pass());
+  mojo::Application app(shell_handle);
+  app.AddServiceFactory(
+      new mojo::ServiceFactory<mojo::examples::ViewManagerImpl>);
   loop.Run();
 
   return MOJO_RESULT_OK;
 }