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

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

Issue 2686003002: mash: Exit main process if content_browser service crashes (Closed)
Patch Set: 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
Index: chrome/app/mash/mash_runner.cc
diff --git a/chrome/app/mash/mash_runner.cc b/chrome/app/mash/mash_runner.cc
index e436fbd92f3dbb085ba22ab8f9138f98e3eac7dc..7628bc688a5251484997242b92103e726398d458 100644
--- a/chrome/app/mash/mash_runner.cc
+++ b/chrome/app/mash/mash_runner.cc
@@ -131,7 +131,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;
}
@@ -204,6 +205,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();
« chrome/app/mash/chrome_mash_manifest.json ('K') | « 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