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

Unified Diff: content/app/content_main_runner.cc

Issue 208223006: Revert of Add creation of ServiceManager to Content (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 | « content/DEPS ('k') | content/app/mojo/mojo_browsertest.cc » ('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 957d604ea190d0d0b167d145d9c09b56aad99326..adf27a995f24aa552dedf8e2b20f06511ac4082e 100644
--- a/content/app/content_main_runner.cc
+++ b/content/app/content_main_runner.cc
@@ -101,10 +101,6 @@
}
#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)
@@ -533,7 +529,7 @@
virtual int Initialize(const ContentMainParams& params) OVERRIDE {
ui_task_ = params.ui_task;
-#if defined(OS_WIN)
+#if defined(OS_WIN)
RegisterInvalidParamHandler();
_Module.Init(NULL, static_cast<HINSTANCE>(params.instance));
@@ -664,11 +660,6 @@
const CommandLine& command_line = *CommandLine::ForCurrentProcess();
std::string process_type =
command_line.GetSwitchValueASCII(switches::kProcessType);
-
-#if defined(USE_MOJO)
- // Initialize mojo here so that services can be registered.
- InitializeMojo();
-#endif
if (!GetContentClient())
SetContentClient(&empty_content_client_);
« no previous file with comments | « content/DEPS ('k') | content/app/mojo/mojo_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698