summaryrefslogtreecommitdiffstats
path: root/content/app/content_main_runner.cc
diff options
context:
space:
mode:
authordarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-24 18:17:53 +0000
committerdarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-24 18:17:53 +0000
commitf68c14642a91a765ed6874e4868606afe1b08e40 (patch)
tree050120e681468fe42bb986cf10e6665335a3d328 /content/app/content_main_runner.cc
parentc0b5b764bba1ad79606b48a76d3c215b63730a1e (diff)
downloadchromium_src-f68c14642a91a765ed6874e4868606afe1b08e40.zip
chromium_src-f68c14642a91a765ed6874e4868606afe1b08e40.tar.gz
chromium_src-f68c14642a91a765ed6874e4868606afe1b08e40.tar.bz2
Move Mojo channel initialization closer to IPC::Channel setup
This CL introduces two new content classes: - MojoApplicationHost encapsulates what's needed to host a Mojo App using Chrome IPC to bootstrap. - MojoApplication represents what's needed to be a Mojo App using Chrome IPC to bootstrap. The RenderProcess and RenderProcessHost interfaces are replaced with WebUISetup and WebUISetupClient interfaces. This way the interface is more specific to the service of setting up WebUI. WebUISetupClient is empty and uninteresting. RenderProcessHostImpl no longer deals with WebUI setup. That is all done directly by RenderViewHostImpl by talking to the WebUISetup service. Service names get defined in content/common/mojo/mojo_service_names.{h,cc}. TBR=sky@chromium.org, tsepez@chromium.org Originally reviewed at https://codereview.chromium.org/236813002/ Review URL: https://codereview.chromium.org/256403004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@265962 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/app/content_main_runner.cc')
-rw-r--r--content/app/content_main_runner.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc
index 71da1a5..2593b28 100644
--- a/content/app/content_main_runner.cc
+++ b/content/app/content_main_runner.cc
@@ -26,9 +26,6 @@
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
#include "content/browser/browser_main.h"
-#include "content/browser/gpu/gpu_process_host.h"
-#include "content/browser/renderer_host/render_process_host_impl.h"
-#include "content/browser/utility_process_host_impl.h"
#include "content/common/set_process_title.h"
#include "content/common/url_schemes.h"
#include "content/gpu/in_process_gpu_thread.h"
@@ -63,6 +60,9 @@
#if !defined(OS_IOS)
#include "content/app/mojo/mojo_init.h"
+#include "content/browser/gpu/gpu_process_host.h"
+#include "content/browser/renderer_host/render_process_host_impl.h"
+#include "content/browser/utility_process_host_impl.h"
#include "content/public/plugin/content_plugin_client.h"
#include "content/public/renderer/content_renderer_client.h"
#include "content/public/utility/content_utility_client.h"