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

Unified Diff: content/browser/browser_main_loop.cc

Issue 2420253002: Rename shell namespace to 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 | « content/browser/browser_context.cc ('k') | content/browser/compositor/gpu_process_transport_factory.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 c3600c7fb3db63d727a1ce7ac253f149d1485031..760f5994e624696a3513032334caf7c20177a966 100644
--- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc
@@ -1211,7 +1211,7 @@ int BrowserMainLoop::BrowserThreadsStarted() {
InitializeMojo();
#if defined(USE_AURA)
- if (shell::ShellIsRemote()) {
+ if (service_manager::ServiceManagerIsRemote()) {
base::CommandLine::ForCurrentProcess()->AppendSwitch(
switches::kIsRunningInMash);
}
@@ -1248,7 +1248,7 @@ int BrowserMainLoop::BrowserThreadsStarted() {
established_gpu_channel = true;
if (!GpuDataManagerImpl::GetInstance()->CanUseGpuBrowserCompositor() ||
parsed_command_line_.HasSwitch(switches::kDisableGpuEarlyInit) ||
- shell::ShellIsRemote()) {
+ service_manager::ServiceManagerIsRemote()) {
established_gpu_channel = always_uses_gpu = false;
}
gpu::GpuChannelEstablishFactory* factory =
@@ -1369,7 +1369,7 @@ int BrowserMainLoop::BrowserThreadsStarted() {
// ChildProcess instance which is created by the renderer thread.
if (GpuDataManagerImpl::GetInstance()->GpuAccessAllowed(NULL) &&
!established_gpu_channel && always_uses_gpu && !UsingInProcessGpu() &&
- !shell::ShellIsRemote()) {
+ !service_manager::ServiceManagerIsRemote()) {
TRACE_EVENT_INSTANT0("gpu", "Post task to launch GPU process",
TRACE_EVENT_SCOPE_THREAD);
BrowserThread::PostTask(
« no previous file with comments | « content/browser/browser_context.cc ('k') | content/browser/compositor/gpu_process_transport_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698