diff options
| author | bartfab@chromium.org <bartfab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-05 19:19:56 +0000 |
|---|---|---|
| committer | bartfab@chromium.org <bartfab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-05 19:19:56 +0000 |
| commit | b7ca311a4f4a23453d6f4bd1084104a30b18d364 (patch) | |
| tree | 381693b856ec8411d5ccacee7adddbacbd02bf35 /chromeos | |
| parent | 72c0d365dd560eabf297e8f2298fddb2d959aef0 (diff) | |
| download | chromium_src-b7ca311a4f4a23453d6f4bd1084104a30b18d364.zip chromium_src-b7ca311a4f4a23453d6f4bd1084104a30b18d364.tar.gz chromium_src-b7ca311a4f4a23453d6f4bd1084104a30b18d364.tar.bz2 | |
Revert 233048 "Support policies referencing external data for de..."
The CL broke compilation on Chrome OS.
> Support policies referencing external data for device-local accounts
>
> This CL adds a DeviceLocalAccountExternalDataService that provides each
> device-local account with a DeviceLocalAccountExternalDataManager which
> fetches, caches and retrieves external policy data.
>
> BUG=256635
> TEST=New browser test
> R=derat@chromium.org, joaodasilva@chromium.org
>
> Review URL: https://codereview.chromium.org/25242002
TBR=bartfab@chromium.org
Review URL: https://codereview.chromium.org/60683002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233051 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos')
| -rw-r--r-- | chromeos/chromeos_paths.cc | 12 | ||||
| -rw-r--r-- | chromeos/chromeos_paths.h | 11 |
2 files changed, 7 insertions, 16 deletions
diff --git a/chromeos/chromeos_paths.cc b/chromeos/chromeos_paths.cc index 25174d45..6e5f268 100644 --- a/chromeos/chromeos_paths.cc +++ b/chromeos/chromeos_paths.cc @@ -33,12 +33,9 @@ const base::FilePath::CharType kUptimeFileName[] = const base::FilePath::CharType kUpdateRebootNeededUptimeFile[] = FILE_PATH_LITERAL("/var/run/chrome/update_reboot_needed_uptime"); -const base::FilePath::CharType kDeviceLocalAccountExtensionDir[] = +const base::FilePath::CharType kDeviceLocalAccountCacheDir[] = FILE_PATH_LITERAL("/var/cache/device_local_account_extensions"); -const base::FilePath::CharType kDeviceLocalAccountExternalDataDir[] = - FILE_PATH_LITERAL("/var/cache/device_local_account_external_policy_data"); - bool PathProvider(int key, base::FilePath* result) { switch (key) { case FILE_DEFAULT_APP_ORDER: @@ -59,11 +56,8 @@ bool PathProvider(int key, base::FilePath* result) { case FILE_UPDATE_REBOOT_NEEDED_UPTIME: *result = base::FilePath(kUpdateRebootNeededUptimeFile); break; - case DIR_DEVICE_LOCAL_ACCOUNT_EXTENSIONS: - *result = base::FilePath(kDeviceLocalAccountExtensionDir); - break; - case DIR_DEVICE_LOCAL_ACCOUNT_EXTERNAL_DATA: - *result = base::FilePath(kDeviceLocalAccountExternalDataDir); + case DIR_DEVICE_LOCAL_ACCOUNT_CACHE: + *result = base::FilePath(kDeviceLocalAccountCacheDir); break; default: return false; diff --git a/chromeos/chromeos_paths.h b/chromeos/chromeos_paths.h index d25ac43..0627ded 100644 --- a/chromeos/chromeos_paths.h +++ b/chromeos/chromeos_paths.h @@ -27,13 +27,10 @@ enum { // store the uptime at which an update // became necessary. The file should be // cleared on boot. - DIR_DEVICE_LOCAL_ACCOUNT_EXTENSIONS, // Directory under which a cache of - // force-installed extensions is - // maintained for each device-local - // account. - DIR_DEVICE_LOCAL_ACCOUNT_EXTERNAL_DATA, // Directory where external data - // referenced by policies is cached - // for device-local accounts. + DIR_DEVICE_LOCAL_ACCOUNT_CACHE, // Directory under which a cache of + // force-installed extensions is maintained + // for each device-local account. + PATH_END }; |