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

Unified Diff: services/catalog/catalog.cc

Issue 2377203005: services/shell: Allow injecting the location of resources.
Patch Set: Created 4 years, 3 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 | « services/catalog/catalog.h ('k') | services/shell/background/background_shell.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/catalog/catalog.cc
diff --git a/services/catalog/catalog.cc b/services/catalog/catalog.cc
index 19b088373551c99d2c1e8b8e4fe61aab08804696..6f513bf855f7058cbe847bb32aabbac497b0dbb5 100644
--- a/services/catalog/catalog.cc
+++ b/services/catalog/catalog.cc
@@ -129,8 +129,9 @@ void Catalog::Create(const shell::Identity& remote_identity,
filesystem::mojom::DirectoryRequest request) {
if (!lock_table_)
lock_table_ = new filesystem::LockTable;
- base::FilePath resources_path =
- GetPathForApplicationName(remote_identity.name());
+ base::FilePath resources_path(override_resource_path_);
+ if (resources_path.empty())
+ resources_path = GetPathForApplicationName(remote_identity.name());
mojo::MakeStrongBinding(
base::MakeUnique<filesystem::DirectoryImpl>(
resources_path, scoped_refptr<filesystem::SharedTempDir>(),
« no previous file with comments | « services/catalog/catalog.h ('k') | services/shell/background/background_shell.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698