Create native_viewport_service, don't build it into mojo_shell unless Android

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_vector.h"
 #include "base/strings/string_split.h"
 #include "build/build_config.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/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/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"
 
 #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/native_viewport_impl.h"
 #include "mojo/shell/network_application_loader.h"
 #endif  // defined(OS_ANDROID)
 
 #if defined(USE_AURA)
 #include "mojo/shell/view_manager_loader.h"
 #endif
 
 namespace mojo {
 namespace shell {
 namespace {
@@ skipping 41 matching lines @@
       LOG(ERROR) << "Invalid value for switch " << switches::kContentHandlers
                  << ": '" << parts[i + 1] << "' is not a valid URL.";
       return;
     }
     loader->RegisterContentHandler(parts[i], url);
   }
 }
 
 }  // namespace
 
-class Context::NativeViewportApplicationLoader
+#if defined(OS_ANDROID)
+class NativeViewportApplicationLoader
     : public ApplicationLoader,
       public ApplicationDelegate,
       public InterfaceFactory<NativeViewport> {
  public:
   NativeViewportApplicationLoader() {}
   virtual ~NativeViewportApplicationLoader() {}
 
  private:
   // ApplicationLoader implementation.
   virtual void Load(ApplicationManager* manager,
@@ skipping 16 matching lines @@
 
   // InterfaceFactory<NativeViewport> implementation.
   virtual void Create(ApplicationConnection* connection,
                       InterfaceRequest<NativeViewport> request) OVERRIDE {
     BindToRequest(new NativeViewportImpl, &request);
   }
 
   scoped_ptr<ApplicationImpl> app_;
   DISALLOW_COPY_AND_ASSIGN(NativeViewportApplicationLoader);
 };
+#endif
 
 Context::Context() {
   DCHECK(!base::MessageLoop::current());
 }
 
 void Context::Init() {
   setup.Get();
   task_runners_.reset(
       new TaskRunners(base::MessageLoop::current()->message_loop_proxy()));
 
@@ skipping 15 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(
@@ skipping 20 matching lines @@
   }
 #endif
 }
 
 Context::~Context() {
   DCHECK(!base::MessageLoop::current());
 }
 
 }  // namespace shell
 }  // namespace mojo