| Index: services/catalog/reader.cc
|
| diff --git a/services/catalog/reader.cc b/services/catalog/reader.cc
|
| index 766aaf483dfcbb29388c1a44694d79c81164606e..67b15d37a6a935e245d2ff30b5a7540400685d6d 100644
|
| --- a/services/catalog/reader.cc
|
| +++ b/services/catalog/reader.cc
|
| @@ -22,6 +22,12 @@
|
| namespace catalog {
|
| namespace {
|
|
|
| +#if defined(OS_WIN)
|
| +const char kServiceExecutableExtension[] = ".service.exe";
|
| +#else
|
| +const char kServiceExecutableExtension[] = ".service";
|
| +#endif
|
| +
|
| base::FilePath GetManifestPath(const base::FilePath& package_dir,
|
| const std::string& name,
|
| const std::string& package_name_override) {
|
| @@ -34,7 +40,8 @@ base::FilePath GetManifestPath(const base::FilePath& package_dir,
|
|
|
| base::FilePath GetExecutablePath(const base::FilePath& package_dir,
|
| const std::string& name) {
|
| - return package_dir.AppendASCII(name + "/" + name + ".service");
|
| + return package_dir.AppendASCII(
|
| + name + "/" + name + kServiceExecutableExtension);
|
| }
|
|
|
| std::unique_ptr<Entry> ProcessManifest(
|
|
|