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

Unified Diff: chrome/common/chrome_paths.cc

Issue 12221065: Disable normal default extensions in case of managed users (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed nits 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
« no previous file with comments | « chrome/common/chrome_paths.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/chrome_paths.cc
diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc
index baada98f3ae8421ea56dda17e8475d136c359fc9..039533d0d82401006a7e87a5e999fc7f48279f92 100644
--- a/chrome/common/chrome_paths.cc
+++ b/chrome/common/chrome_paths.cc
@@ -406,6 +406,13 @@ bool PathProvider(int key, base::FilePath* result) {
cur = base::FilePath(FILE_PATH_LITERAL(kDefaultAppOrderFileName));
break;
#endif
+#if defined(ENABLE_MANAGED_USERS)
+ case chrome::DIR_MANAGED_USERS_DEFAULT_APPS:
+ if (!PathService::Get(chrome::DIR_EXTERNAL_EXTENSIONS, &cur))
+ return false;
+ cur = cur.Append(FILE_PATH_LITERAL("managed_users"));
+ break;
+#endif
// The following are only valid in the development environment, and
// will fail if executed from an installed executable (because the
// generated path won't exist).
@@ -497,7 +504,7 @@ bool PathProvider(int key, base::FilePath* result) {
#else
if (!PathService::Get(chrome::DIR_APP, &cur))
return false;
- cur = cur.Append(FILE_PATH_LITERAL("default_apps"));
+ cur.Append(FILE_PATH_LITERAL("default_apps"));
Nico 2013/02/11 15:47:06 Huh? Why this change? This is a bug, no? Does this
Dmitry Polukhin 2013/02/11 17:43:52 Oops... It is unintended change. I accidentally re
#endif
break;
« no previous file with comments | « chrome/common/chrome_paths.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698