diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-05 20:14:17 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-05 20:14:17 +0000 |
| commit | 1c142a5d402b0a0a33ca345dbc65af719ff7f294 (patch) | |
| tree | 83c68ddffcb391bf1acb218aac1cd19d91df7cf8 /content/app | |
| parent | f6c30c92b7d0d3202bced1f0b991dc0e72a3ff66 (diff) | |
| download | chromium_src-1c142a5d402b0a0a33ca345dbc65af719ff7f294.zip chromium_src-1c142a5d402b0a0a33ca345dbc65af719ff7f294.tar.gz chromium_src-1c142a5d402b0a0a33ca345dbc65af719ff7f294.tar.bz2 | |
Removes use_mojo
Now that we've sorted out the build issues on all platforms it can be
removed.
BUG=353602
TEST=none
R=jam@chromium.org
TBR=tsepez@chromium.org
Review URL: https://codereview.chromium.org/226213002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@262032 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/app')
| -rw-r--r-- | content/app/content_main_runner.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc index d64eb45..a00066f 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 |