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

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

Issue 2646033002: mash: Exit the root process if the window manager service crashes (Closed)
Patch Set: review comments Created 3 years, 11 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') | chrome/app/mash/mash_runner.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/mash/mash_runner.h
diff --git a/chrome/app/mash/mash_runner.h b/chrome/app/mash/mash_runner.h
index deaea41a5765d69747d29483559d84a3e679dd9f..75ffd0fbfffeb7f1999671341c0bb872b2b9bf08 100644
--- a/chrome/app/mash/mash_runner.h
+++ b/chrome/app/mash/mash_runner.h
@@ -25,7 +25,13 @@ class MashRunner {
int Run();
private:
- void RunMain();
+ // Runs the main process, including the service manager. Returns the exit
+ // value for the process.
+ int RunMain();
+
+ // Runs a background service manager in the main process. Returns the exit
+ // value for the process.
+ int RunServiceManagerInMain();
// Returns 0 if the child process was initialized correctly, or error code on
// failure.
@@ -33,6 +39,7 @@ class MashRunner {
void StartChildApp(service_manager::mojom::ServiceRequest service_request);
+ // Context for service manager in the main process.
std::unique_ptr<service_manager::ServiceContext> context_;
DISALLOW_COPY_AND_ASSIGN(MashRunner);
« no previous file with comments | « chrome/app/mash/chrome_mash_manifest.json ('k') | chrome/app/mash/mash_runner.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698