Revert of Second attempt to land change to remove NativeViewportService and

mojo/shell/context.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 "mojo/shell/context.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/strings/string_split.h"
 #include "build/build_config.h"
 #include "gpu/command_buffer/service/mailbox_manager.h"
 #include "mojo/application_manager/application_loader.h"
 #include "mojo/application_manager/application_manager.h"
 #include "mojo/application_manager/background_shell_application_loader.h"
 #include "mojo/embedder/embedder.h"
 #include "mojo/embedder/simple_platform_support.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/services/native_viewport/gpu_impl.h"
+#include "mojo/services/native_viewport/native_viewport_impl.h"
 #include "mojo/shell/dynamic_application_loader.h"
 #include "mojo/shell/in_process_dynamic_service_runner.h"
 #include "mojo/shell/out_of_process_dynamic_service_runner.h"
 #include "mojo/shell/switches.h"
 #include "mojo/shell/ui_application_loader_android.h"
 #include "mojo/spy/spy.h"
+#include "ui/gl/gl_share_group.h"
 
 #if defined(OS_LINUX)
 #include "mojo/shell/dbus_application_loader_linux.h"
 #endif  // defined(OS_LINUX)
 
 #if defined(OS_ANDROID)
-#include "mojo/services/native_viewport/gpu_impl.h"
-#include "mojo/services/native_viewport/native_viewport_impl.h"
 #include "mojo/shell/network_application_loader.h"
-#include "ui/gl/gl_share_group.h"
 #endif  // defined(OS_ANDROID)
 
+#if defined(USE_AURA)
+#include "mojo/shell/view_manager_loader.h"
+#endif
+
 namespace mojo {
 namespace shell {
 namespace {
 
 // These mojo: URLs are loaded directly from the local filesystem. They
 // correspond to shared libraries bundled alongside the mojo_shell.
 const char* kLocalMojoURLs[] = {
   "mojo:mojo_network_service",
 };
 
@@ skipping 48 matching lines @@
 class EmptyServiceProvider : public InterfaceImpl<ServiceProvider> {
  private:
   virtual void ConnectToService(const mojo::String& service_name,
                                 ScopedMessagePipeHandle client_handle)
       MOJO_OVERRIDE {
   }
 };
 
 }  // namespace
 
-#if defined(OS_ANDROID)
 class Context::NativeViewportApplicationLoader
     : public ApplicationLoader,
       public ApplicationDelegate,
       public InterfaceFactory<NativeViewport>,
       public InterfaceFactory<Gpu> {
  public:
   NativeViewportApplicationLoader()
       : share_group_(new gfx::GLShareGroup),
         mailbox_manager_(new gpu::gles2::MailboxManager) {}
   virtual ~NativeViewportApplicationLoader() {}
@@ skipping 30 matching lines @@
                       InterfaceRequest<Gpu> request) OVERRIDE {
     BindToRequest(new GpuImpl(share_group_.get(), mailbox_manager_.get()),
                   &request);
   }
 
   scoped_refptr<gfx::GLShareGroup> share_group_;
   scoped_refptr<gpu::gles2::MailboxManager> mailbox_manager_;
   scoped_ptr<ApplicationImpl> app_;
   DISALLOW_COPY_AND_ASSIGN(NativeViewportApplicationLoader);
 };
-#endif
 
 Context::Context() {
   DCHECK(!base::MessageLoop::current());
 }
 
 Context::~Context() {
   DCHECK(!base::MessageLoop::current());
 }
 
 void Context::Init() {
@@ skipping 20 matching lines @@
 
   // The native viewport service synchronously waits for certain messages. If we
   // don't run it on its own thread we can easily deadlock. Long term native
   // viewport should run its own process so that this isn't an issue.
 #if defined(OS_ANDROID)
   application_manager_.SetLoaderForURL(
       scoped_ptr<ApplicationLoader>(new UIApplicationLoader(
           scoped_ptr<ApplicationLoader>(new NativeViewportApplicationLoader()),
           this)),
       GURL("mojo:mojo_native_viewport_service"));
+#else
+  {
+    scoped_ptr<BackgroundShellApplicationLoader> loader(
+        new BackgroundShellApplicationLoader(
+            scoped_ptr<ApplicationLoader>(
+                new NativeViewportApplicationLoader()),
+            "native_viewport",
+            base::MessageLoop::TYPE_UI));
+    application_manager_.SetLoaderForURL(
+        loader.PassAs<ApplicationLoader>(),
+        GURL("mojo:mojo_native_viewport_service"));
+  }
+#endif
+#if defined(USE_AURA)
+  // TODO(sky): need a better way to find this. It shouldn't be linked in.
+  application_manager_.SetLoaderForURL(
+      scoped_ptr<ApplicationLoader>(new ViewManagerLoader()),
+      GURL("mojo:mojo_view_manager"));
 #endif
 
 #if defined(OS_LINUX)
   application_manager_.SetLoaderForScheme(
       scoped_ptr<ApplicationLoader>(new DBusApplicationLoader(this)), "dbus");
 #endif  // defined(OS_LINUX)
 
   if (command_line->HasSwitch(switches::kSpy)) {
     spy_.reset(
         new mojo::Spy(&application_manager_,
@@ skipping 35 matching lines @@
 ScopedMessagePipeHandle Context::ConnectToServiceByName(
     const GURL& application_url,
     const std::string& service_name) {
   app_urls_.insert(application_url);
   return application_manager_.ConnectToServiceByName(
       application_url, service_name).Pass();
 }
 
 }  // namespace shell
 }  // namespace mojo