| 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);
|
|
|