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

Unified Diff: services/catalog/reader.cc

Issue 1982553002: Fix manifest loading for catalog and shell. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@client2
Patch Set: Created 4 years, 7 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/catalog/reader.cc
diff --git a/services/catalog/reader.cc b/services/catalog/reader.cc
index 0253bfb756045327a5d99148ff56a15bddd2e999..ad8dd74887387b0bbb87b7287489088a42323048 100644
--- a/services/catalog/reader.cc
+++ b/services/catalog/reader.cc
@@ -107,8 +107,10 @@ void ScanDir(
// build (e.g. for applications that are packaged into others) and are not
// valid standalone packages.
base::FilePath package_path = GetPackagePath(package_dir, entry->name());
- if (!base::PathExists(package_path))
+ if (entry->name() != "mojo:shell" && entry->name() != "mojo:catalog" &&
+ !base::PathExists(package_path)) {
continue;
+ }
original_thread_task_runner->PostTask(
FROM_HERE,
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698