Change mojo demo apps to use Application.

mojo/examples/launcher/launcher.cc

 // Copyright 2013 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 <string>
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/i18n/icu_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "mojo/examples/aura_demo/demo_screen.h"
 #include "mojo/examples/aura_demo/root_window_host_mojo.h"
 #include "mojo/public/bindings/allocation_scope.h"
 #include "mojo/public/bindings/remote_ptr.h"
 #include "mojo/public/gles2/gles2_cpp.h"
+#include "mojo/public/shell/application.h"
 #include "mojo/public/system/core.h"
 #include "mojo/public/system/macros.h"
 #include "mojom/launcher.h"
 #include "mojom/native_viewport.h"
 #include "mojom/shell.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/default_activation_client.h"
 #include "ui/aura/client/default_capture_client.h"
 #include "ui/aura/client/window_tree_client.h"
 #include "ui/aura/env.h"
@@ skipping 151 matching lines @@
       url_receiver_->OnURLEntered(url.spec());
     }
     return false;
   }
 
   URLReceiver* url_receiver_;
 
   DISALLOW_COPY_AND_ASSIGN(LauncherController);
 };
 
-class LauncherImpl : public ShellClient,
+class LauncherImpl : public Application,
                      public Launcher,
                      public URLReceiver {
  public:
-  explicit LauncherImpl(ScopedShellHandle shell_handle)
-      : launcher_controller_(this),
-        shell_(shell_handle.Pass(), this),
+  explicit LauncherImpl(MojoHandle shell_handle)
+      : Application(shell_handle),
+        launcher_controller_(this),
         pending_show_(false) {
     screen_.reset(DemoScreen::Create());
     gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, screen_.get());
 
     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());
 
     root_window_host_.reset(new WindowTreeHostMojo(
         pipe.handle_to_self.Pass(), gfx::Rect(50, 50, 450, 60),
         base::Bind(&LauncherImpl::HostContextCreated, base::Unretained(this))));
   }
 
  private:
-  // Overridden from ShellClient:
+  // Overridden from Application:
   virtual void AcceptConnection(const mojo::String& url,
                                 ScopedMessagePipeHandle handle) MOJO_OVERRIDE {
     launcher_client_.reset(
         MakeScopedHandle(LauncherClientHandle(handle.release().value())).Pass(),
         this);
   }
 
   // Overridden from Launcher:
   virtual void Show() OVERRIDE {
     if (!root_window_.get()) {
@@ skipping 41 matching lines @@
 
   scoped_ptr<DemoScreen> screen_;
   scoped_ptr<LauncherWindowTreeClient> window_tree_client_;
   scoped_ptr<aura::client::DefaultActivationClient> activation_client_;
   scoped_ptr<aura::client::FocusClient> focus_client_;
   scoped_ptr<aura::client::DefaultCaptureClient> capture_client_;
   scoped_ptr<ui::EventHandler> ime_filter_;
 
   LauncherController launcher_controller_;
 
-  RemotePtr<Shell> shell_;
   RemotePtr<LauncherClient> launcher_client_;
   scoped_ptr<WindowTreeHostMojo> root_window_host_;
   scoped_ptr<aura::RootWindow> root_window_;
 
   bool pending_show_;
 };
 
 }  // namespace examples
 }  // namespace mojo
 
 extern "C" LAUNCHER_EXPORT MojoResult CDECL MojoMain(
     MojoHandle shell_handle) {
   CommandLine::Init(0, NULL);
   base::AtExitManager at_exit;
   base::i18n::InitializeICU();
 
   base::FilePath pak_dir;
   PathService::Get(base::DIR_MODULE, &pak_dir);
   base::FilePath pak_file;
   pak_file = pak_dir.Append(FILE_PATH_LITERAL("ui_test.pak"));
   ui::ResourceBundle::InitSharedInstanceWithPakPath(pak_file);
 
   base::MessageLoop loop;
   mojo::GLES2Initializer gles2;
 
   // TODO(beng): This crashes in a DCHECK on X11 because this thread's
   //             MessageLoop is not of TYPE_UI. I think we need a way to build
   //             Aura that doesn't define platform-specific stuff.
   aura::Env::CreateInstance();
-  mojo::examples::LauncherImpl launcher(
-      mojo::MakeScopedHandle(mojo::ShellHandle(shell_handle)).Pass());
+  mojo::examples::LauncherImpl launcher(shell_handle);
   loop.Run();
 
   return MOJO_RESULT_OK;
 }