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

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: 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 df00d2985f33f7d71193fddc49a953372d65ec4b..9177df160202187fc02f468515dc6e3c026e6998 100644
--- a/chrome/common/chrome_paths.cc
+++ b/chrome/common/chrome_paths.cc
@@ -401,6 +401,13 @@ bool PathProvider(int key, FilePath* result) {
cur = 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).
@@ -492,7 +499,7 @@ bool PathProvider(int key, 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"));
#endif
break;
« chrome/browser/extensions/external_provider_impl.cc ('K') | « chrome/common/chrome_paths.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698