diff options
| author | dpolukhin@chromium.org <dpolukhin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-29 22:55:46 +0000 |
|---|---|---|
| committer | dpolukhin@chromium.org <dpolukhin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-29 22:55:46 +0000 |
| commit | 5bed2ec38a11d8b11c29b2831cdf19e973879ad0 (patch) | |
| tree | cf7763b9b991ad7156208740e2c5a316a73f383f /chrome/common/chrome_paths.cc | |
| parent | f346618f6e1d9746b5b8dcbc1021dd133d136c14 (diff) | |
| download | chromium_src-5bed2ec38a11d8b11c29b2831cdf19e973879ad0.zip chromium_src-5bed2ec38a11d8b11c29b2831cdf19e973879ad0.tar.gz chromium_src-5bed2ec38a11d8b11c29b2831cdf19e973879ad0.tar.bz2 | |
Move default apps from Chrome to Chrome OS
Also changed dir with default apps for managed users.
Main CL that moves cache: https://gerrit-int.chromium.org/#/c/42720/
BUG=271247
TEST=manual
R=jhawkins@chromium.org, mek@chromium.org
Review URL: https://codereview.chromium.org/22931006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@220410 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/chrome_paths.cc')
| -rw-r--r-- | chrome/common/chrome_paths.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc index d323aa7..904fbef 100644 --- a/chrome/common/chrome_paths.cc +++ b/chrome/common/chrome_paths.cc @@ -395,9 +395,9 @@ bool PathProvider(int key, base::FilePath* result) { cur = cur.Append(FILE_PATH_LITERAL("custom_wallpapers")); break; #endif -#if defined(ENABLE_MANAGED_USERS) +#if defined(OS_LINUX) && defined(ENABLE_MANAGED_USERS) case chrome::DIR_MANAGED_USERS_DEFAULT_APPS: - if (!PathService::Get(chrome::DIR_EXTERNAL_EXTENSIONS, &cur)) + if (!PathService::Get(chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS, &cur)) return false; cur = cur.Append(FILE_PATH_LITERAL("managed_users")); break; |