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

Unified Diff: chrome/browser/chrome_browser_main.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 | « chrome/app/mash/mash_runner.cc ('k') | chrome/browser/chrome_content_browser_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chrome_browser_main.cc
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
index 856ac80cc727a27ef62fa2546893ab045527fc49..30cd670d3a522378491652b75eab84bfaa58c64a 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -1376,7 +1376,7 @@ void ChromeBrowserMainParts::ServiceManagerConnectionStarted(
void ChromeBrowserMainParts::PreMainMessageLoopRun() {
#if defined(USE_AURA)
if (content::ServiceManagerConnection::GetForProcess() &&
- shell::ShellIsRemote()) {
+ service_manager::ServiceManagerIsRemote()) {
content::ServiceManagerConnection::GetForProcess()->
SetConnectionLostClosure(base::Bind(&chrome::SessionEnding));
}
« no previous file with comments | « chrome/app/mash/mash_runner.cc ('k') | chrome/browser/chrome_content_browser_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698