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

Unified Diff: chrome/common/chrome_paths.cc

Issue 12183017: Verify the signature on user cloud policy downloads. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased, addressed latest comments Created 7 years, 10 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
Index: chrome/common/chrome_paths.cc
diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc
index dcc7a86d184b91776ee7d310262b7d1c293dd619..d7e1538bac673430a6ffb6389f02c1145d67e77b 100644
--- a/chrome/common/chrome_paths.cc
+++ b/chrome/common/chrome_paths.cc
@@ -93,12 +93,17 @@ const char kFilepathSinglePrefExtensions[] =
#endif // defined(OS_LINUX)
#if defined(OS_CHROMEOS)
+
const char kDefaultAppOrderFileName[] =
#if defined(GOOGLE_CHROME_BUILD)
FILE_PATH_LITERAL("/usr/share/google-chrome/default_app_order.json");
#else
FILE_PATH_LITERAL("/usr/share/chromium/default_app_order.json");
#endif // defined(GOOGLE_CHROME_BUILD)
+
+const FilePath::CharType kDefaultUserPolicyKeysDir[] =
+ FILE_PATH_LITERAL("/var/run/user_policy");
+
#endif // defined(OS_CHROMEOS)
} // namespace
@@ -400,6 +405,9 @@ bool PathProvider(int key, base::FilePath* result) {
case chrome::FILE_DEFAULT_APP_ORDER:
cur = base::FilePath(FILE_PATH_LITERAL(kDefaultAppOrderFileName));
Mattias Nissler (ping if slow) 2013/02/08 17:06:30 If you feel like cleaning up: FWIW, this is wrong
Joao da Silva 2013/02/13 16:22:05 Done in https://codereview.chromium.org/12230014/
break;
+ case chrome::DIR_USER_POLICY_KEYS:
+ cur = FilePath(kDefaultUserPolicyKeysDir);
+ break;
#endif
// The following are only valid in the development environment, and
// will fail if executed from an installed executable (because the

Powered by Google App Engine
This is Rietveld 408576698