Chromium Code Reviews| Index: mash/common/config.cc |
| diff --git a/mash/common/config.cc b/mash/common/config.cc |
| index f4e14f7809364732bcc8324771866f4fc8370ae5..1b6bc20cf62df747aca6a18b3bd82a167918de61 100644 |
| --- a/mash/common/config.cc |
| +++ b/mash/common/config.cc |
| @@ -4,6 +4,9 @@ |
| #include "mash/common/config.h" |
| +#if defined(USE_ASH) |
| +#include "ash/public/interfaces/constants.mojom.h" // nogncheck |
| +#endif |
| #include "base/command_line.h" |
| namespace mash { |
| @@ -18,8 +21,13 @@ std::string GetWindowManagerServiceName() { |
| kWindowManagerSwitch); |
| return service_name; |
| } |
| - // TODO(beng): move this constant to a mojom file in //ash. |
| - return "ash"; |
| +#if defined(USE_ASH) |
| + return ash::mojom::kServiceName; |
| +#else |
| + LOG(FATAL) |
| + << "You must specify a window manager e.g. --window-manager=simple_wm"; |
| + return ""; |
|
dcheng
2017/02/22 18:01:07
Nit: std::string() is more efficient than an impli
|
| +#endif |
| } |
| } // namespace common |