Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1017)

Unified Diff: content/app/content_main_runner.cc

Issue 226213002: Removes use_mojo (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge 2 trunk Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/common.gypi ('k') | content/browser/renderer_host/render_process_host_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/app/content_main_runner.cc
diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc
index d64eb45f0fc5db9b4d569fe4d110a9efb9e5a0a8..a00066f98eb9f38334445579538d7dce1a7257d7 100644
--- a/content/app/content_main_runner.cc
+++ b/content/app/content_main_runner.cc
@@ -61,6 +61,7 @@
#endif
#if !defined(OS_IOS)
+#include "content/app/mojo/mojo_init.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"
@@ -101,10 +102,6 @@ int tc_set_new_mode(int mode);
}
#endif
-#if defined(USE_MOJO)
-#include "content/app/mojo/mojo_init.h"
-#endif
-
namespace content {
extern int GpuMain(const content::MainFunctionParams&);
#if defined(ENABLE_PLUGINS)
@@ -665,7 +662,7 @@ class ContentMainRunnerImpl : public ContentMainRunner {
std::string process_type =
command_line.GetSwitchValueASCII(switches::kProcessType);
-#if defined(USE_MOJO)
+#if !defined(OS_IOS)
// Initialize mojo here so that services can be registered.
InitializeMojo();
#endif
@@ -812,7 +809,7 @@ class ContentMainRunnerImpl : public ContentMainRunner {
delegate_->ProcessExiting(process_type);
}
-#if defined(USE_MOJO)
+#if !defined(OS_IOS)
ShutdownMojo();
#endif
« no previous file with comments | « build/common.gypi ('k') | content/browser/renderer_host/render_process_host_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698