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

Unified Diff: content/browser/browser_main_loop.cc

Issue 2387263002: Rename MojoShellContext -> ServiceManagerContext. (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 | « content/browser/browser_main_loop.h ('k') | content/browser/gpu/gpu_process_host.cc » ('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 9b0950f631d9a6a2b2056ef9267ca108c0712924..86ca49dd2e1bc503cf6faaab06b07b87be56ce61 100644
--- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc
@@ -56,10 +56,10 @@
#include "content/browser/loader/resource_dispatcher_host_impl.h"
#include "content/browser/loader_delegate_impl.h"
#include "content/browser/media/media_internals.h"
-#include "content/browser/mojo/mojo_shell_context.h"
#include "content/browser/net/browser_online_state_observer.h"
#include "content/browser/renderer_host/media/media_stream_manager.h"
#include "content/browser/renderer_host/render_process_host_impl.h"
+#include "content/browser/service_manager/service_manager_context.h"
#include "content/browser/speech/speech_recognition_manager_impl.h"
#include "content/browser/startup_task_runner.h"
#include "content/browser/utility_process_host_impl.h"
@@ -1067,7 +1067,7 @@ void BrowserMainLoop::ShutdownThreadsAndCleanUp() {
#endif
// Shutdown Mojo shell and IPC.
- mojo_shell_context_.reset();
+ service_manager_context_.reset();
mojo_ipc_support_.reset();
// Must be size_t so we can subtract from it.
@@ -1471,7 +1471,7 @@ void BrowserMainLoop::InitializeMojo() {
BrowserThread::UnsafeGetMessageLoopForThread(BrowserThread::IO)
->task_runner()));
- mojo_shell_context_.reset(new MojoShellContext);
+ service_manager_context_.reset(new ServiceManagerContext);
#if defined(OS_MACOSX)
mojo::edk::SetMachPortProvider(MachBroker::GetInstance());
#endif // defined(OS_MACOSX)
« no previous file with comments | « content/browser/browser_main_loop.h ('k') | content/browser/gpu/gpu_process_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698