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

Unified Diff: chrome/app/mash/mash_runner.cc

Issue 2686003002: mash: Exit main process if content_browser service crashes (Closed)
Patch Set: rebase Created 3 years, 10 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/chrome_mash_manifest.json ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/mash/mash_runner.cc
diff --git a/chrome/app/mash/mash_runner.cc b/chrome/app/mash/mash_runner.cc
index 2923afcb75c417a4a28004f212e1dc2e864262f8..1852834e6f015b6f7c1d9a6486d487f241bce965 100644
--- a/chrome/app/mash/mash_runner.cc
+++ b/chrome/app/mash/mash_runner.cc
@@ -132,7 +132,8 @@ void OnInstanceQuitInMain(base::RunLoop* run_loop,
DCHECK(run_loop);
if (identity.name() != mash::common::GetWindowManagerServiceName() &&
- identity.name() != ui::mojom::kServiceName) {
+ identity.name() != ui::mojom::kServiceName &&
+ identity.name() != content::mojom::kBrowserServiceName) {
return;
}
@@ -207,6 +208,7 @@ int MashRunner::RunServiceManagerInMain() {
context.connector()->Connect(ui::mojom::kServiceName);
context.connector()->Connect(mash::common::GetWindowManagerServiceName());
context.connector()->Connect(mash::quick_launch::mojom::kServiceName);
+ context.connector()->Connect(content::mojom::kBrowserServiceName);
run_loop.Run();
« no previous file with comments | « chrome/app/mash/chrome_mash_manifest.json ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698