| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef CHROME_APP_MASH_MASH_RUNNER_H_ | 5 #ifndef CHROME_APP_MASH_MASH_RUNNER_H_ |
| 6 #define CHROME_APP_MASH_MASH_RUNNER_H_ | 6 #define CHROME_APP_MASH_MASH_RUNNER_H_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 | 9 |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| (...skipping 22 matching lines...) Expand all Loading... |
| 33 | 33 |
| 34 void StartChildApp(service_manager::mojom::ServiceRequest service_request); | 34 void StartChildApp(service_manager::mojom::ServiceRequest service_request); |
| 35 | 35 |
| 36 std::unique_ptr<service_manager::ServiceContext> context_; | 36 std::unique_ptr<service_manager::ServiceContext> context_; |
| 37 | 37 |
| 38 DISALLOW_COPY_AND_ASSIGN(MashRunner); | 38 DISALLOW_COPY_AND_ASSIGN(MashRunner); |
| 39 }; | 39 }; |
| 40 | 40 |
| 41 int MashMain(); | 41 int MashMain(); |
| 42 | 42 |
| 43 // Called if the command line isn't mash to potentially wait for a debugger |
| 44 // to attach. |
| 45 void WaitForMashDebuggerIfNecessary(); |
| 46 |
| 43 #endif // CHROME_APP_MASH_MASH_RUNNER_H_ | 47 #endif // CHROME_APP_MASH_MASH_RUNNER_H_ |
| OLD | NEW |