Aura on Android: content/browser

content/browser/renderer_host/render_process_host_impl.cc

 // Copyright 2012 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.
 
 // Represents the browser side of the browser <--> renderer communication
 // channel. There will be one RenderProcessHost per renderer process.
 
 #include "content/browser/renderer_host/render_process_host_impl.h"
 
 #include <algorithm>
@@ skipping 920 matching lines @@
   AddFilter(new DeviceOrientationMessageFilter());
   AddFilter(new ProfilerMessageFilter(PROCESS_TYPE_RENDERER));
   AddFilter(new HistogramMessageFilter());
 #if defined(USE_TCMALLOC) && (defined(OS_LINUX) || defined(OS_ANDROID))
   if (browser_command_line.HasSwitch(switches::kEnableMemoryBenchmarking))
     AddFilter(new MemoryBenchmarkMessageFilter());
 #endif
   AddFilter(new MemoryMessageFilter());
   AddFilter(new PushMessagingMessageFilter(
       GetID(), storage_partition_impl_->GetServiceWorkerContext()));
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) && !defined(USE_AURA)

[no sievers, 2015/10/22 20:55:41]

TODO(crbug.com/546719)

[mfomitchev, 2015/11/02 21:51:16]

Done.

   AddFilter(new ScreenOrientationMessageFilterAndroid());
 #endif
   AddFilter(new GeofencingDispatcherHost(
       storage_partition_impl_->GetGeofencingManager()));
   if (browser_command_line.HasSwitch(switches::kEnableWebBluetooth)) {
     bluetooth_dispatcher_host_ = new BluetoothDispatcherHost(GetID());
     AddFilter(bluetooth_dispatcher_host_.get());
   }
 }
 
@@ skipping 12 matching lines @@
 
   mojo_application_host_->service_registry()->AddService(base::Bind(
       &BackgroundSyncContextImpl::CreateService,
       base::Unretained(storage_partition_impl_->GetBackgroundSyncContext())));
 
   mojo_application_host_->service_registry()->AddService(base::Bind(
       &content::ServicePortServiceImpl::Create,
       make_scoped_refptr(storage_partition_impl_->GetNavigatorConnectContext()),
       message_port_message_filter_));
 
-#if defined(OS_ANDROID)
+  // TODO(mfomitchev): Hopefully this is not needed...
+#if defined(OS_ANDROID) && !defined(USE_AURA)
   ServiceRegistrarAndroid::RegisterProcessHostServices(

[no sievers, 2015/10/22 20:55:41]

revert

[mfomitchev, 2015/11/02 21:51:16]

Done.

       mojo_application_host_->service_registry_android());
 #endif
 
   GetContentClient()->browser()->RegisterRenderProcessMojoServices(
       mojo_application_host_->service_registry());
 }
 
 int RenderProcessHostImpl::GetNextRoutingID() {
   return widget_helper_->GetNextRoutingID();
 }
@@ skipping 470 matching lines @@
 bool RenderProcessHostImpl::IsReady() const {
   // The process launch result (that sets GetHandle()) and the channel
   // connection (that sets channel_connected_) can happen in either order.
   return GetHandle() && channel_connected_;
 }
 
 bool RenderProcessHostImpl::Shutdown(int exit_code, bool wait) {
   if (run_renderer_in_process())
     return false;  // Single process mode never shuts down the renderer.
 
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) && !defined(USE_AURA)

[no sievers, 2015/10/22 20:55:41]

revert

[mfomitchev, 2015/11/02 21:51:16]

Done.

   // Android requires a different approach for killing.
   StopChildProcess(GetHandle());
   return true;
 #else
   if (!child_process_launcher_.get() || child_process_launcher_->IsStarting())
     return false;
 
   return child_process_launcher_->GetProcess().Terminate(exit_code, wait);
 #endif
 }
@@ skipping 1052 matching lines @@
 void RenderProcessHostImpl::GetAudioOutputControllers(
     const GetAudioOutputControllersCallback& callback) const {
   audio_renderer_host()->GetOutputControllers(callback);
 }
 
 BluetoothDispatcherHost* RenderProcessHostImpl::GetBluetoothDispatcherHost() {
   return bluetooth_dispatcher_host_.get();
 }
 
 }  // namespace content