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

Unified Diff: chromeos/chromeos_paths.cc

Issue 780203002: Fix threading bugs in product label UI. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix ImageSource Created 6 years 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
« chromeos/chromeos_paths.h ('K') | « chromeos/chromeos_paths.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/chromeos_paths.cc
diff --git a/chromeos/chromeos_paths.cc b/chromeos/chromeos_paths.cc
index 659c2405014072eeecb542297ac115b67f41b69e..66d4d38443987c4ad1768bf396f94e3e7f4a34e1 100644
--- a/chromeos/chromeos_paths.cc
+++ b/chromeos/chromeos_paths.cc
@@ -44,6 +44,9 @@ const base::FilePath::CharType kDeviceLocalAccountExternalDataDir[] =
const base::FilePath::CharType kDeviceLocalAccountComponentPolicy[] =
FILE_PATH_LITERAL("/var/cache/device_local_account_component_policy");
+const base::FilePath::CharType kSharedAssetsDir[] =
+ FILE_PATH_LITERAL("/usr/share/chromeos-assets");
+
bool PathProvider(int key, base::FilePath* result) {
switch (key) {
case FILE_DEFAULT_APP_ORDER:
@@ -73,6 +76,9 @@ bool PathProvider(int key, base::FilePath* result) {
case DIR_DEVICE_LOCAL_ACCOUNT_COMPONENT_POLICY:
*result = base::FilePath(kDeviceLocalAccountComponentPolicy);
break;
+ case DIR_SHARED_ASSETS:
+ *result = base::FilePath(kSharedAssetsDir);
+ break;
default:
return false;
}
@@ -114,6 +120,9 @@ void RegisterStubPathOverrides(const base::FilePath& stubs_dir) {
PathService::Override(
DIR_DEVICE_LOCAL_ACCOUNT_COMPONENT_POLICY,
parent.AppendASCII("stub_device_local_account_component_policy"));
+ PathService::Override(
+ DIR_SHARED_ASSETS,
+ parent.AppendASCII("stub_shared_assets"));
}
} // namespace chromeos
« chromeos/chromeos_paths.h ('K') | « chromeos/chromeos_paths.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698