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

Unified Diff: content/browser/browser_main_loop.cc

Issue 2427443002: Replace remaining shell references with service manager (Closed)
Patch Set: Created 4 years, 2 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 | « components/leveldb/BUILD.gn ('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/browser/browser_main_loop.cc
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
index b2a5fc3cebd3aee7700b78ec800e5b4b182b3b06..732423e1dc9da69072f07191f0817da38e80a8fa 100644
--- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc
@@ -1055,7 +1055,7 @@ void BrowserMainLoop::ShutdownThreadsAndCleanUp() {
device_monitor_mac_.reset();
#endif
- // Shutdown Mojo shell and IPC.
+ // Shutdown the Service Manager and IPC.
service_manager_context_.reset();
mojo_ipc_support_.reset();
@@ -1194,9 +1194,9 @@ void BrowserMainLoop::InitializeMainThread() {
int BrowserMainLoop::BrowserThreadsStarted() {
TRACE_EVENT0("startup", "BrowserMainLoop::BrowserThreadsStarted");
- // Bring up Mojo IPC and shell as early as possible. Initializaing mojo
- // requires the IO thread to have been initialized first. So this cannot
- // happen any earlier than this.
+ // Bring up Mojo IPC and the embedded Service Manager as early as possible.
+ // Initializaing mojo requires the IO thread to have been initialized first,
+ // so this cannot happen any earlier than now.
InitializeMojo();
#if defined(USE_AURA)
« no previous file with comments | « components/leveldb/BUILD.gn ('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