summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordavidroche@chromium.org <davidroche@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-29 19:47:45 +0000
committerdavidroche@chromium.org <davidroche@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-29 19:47:45 +0000
commit0c35f2ead17f9c56cd0216ad12f0bbba40ea1f92 (patch)
treea6abafcc2d2c6b128b0e52fba0fd5d7a9e29d993
parent9e7d2376ba416aecb2c8e695dadb2c02b20473d1 (diff)
downloadchromium_src-0c35f2ead17f9c56cd0216ad12f0bbba40ea1f92.zip
chromium_src-0c35f2ead17f9c56cd0216ad12f0bbba40ea1f92.tar.gz
chromium_src-0c35f2ead17f9c56cd0216ad12f0bbba40ea1f92.tar.bz2
The underlying implementation has been removed from Chrome OS.
https://chromium-review.googlesource.com/#/c/190984/ https://chromium-review.googlesource.com/#/c/191137/ BUG=343781 Review URL: https://codereview.chromium.org/204983009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266939 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc12
-rw-r--r--chrome/browser/chromeos/policy/proto/chrome_device_policy.proto3
-rw-r--r--components/policy/resources/policy_templates.json9
3 files changed, 7 insertions, 17 deletions
diff --git a/chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc b/chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc
index 961252f..0e740a6 100644
--- a/chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc
+++ b/chrome/browser/chromeos/policy/device_policy_decoder_chromeos.cc
@@ -769,18 +769,6 @@ void DecodeGenericPolicies(const em::ChromeDeviceSettingsProto& policy,
}
}
}
- if (policy.has_auto_clean_up_settings()) {
- const em::AutoCleanupSettigsProto& container(
- policy.auto_clean_up_settings());
- if (container.has_clean_up_strategy()) {
- policies->Set(key::kAutoCleanUpStrategy,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_MACHINE,
- new base::StringValue(
- container.clean_up_strategy()),
- NULL);
- }
- }
}
} // namespace
diff --git a/chrome/browser/chromeos/policy/proto/chrome_device_policy.proto b/chrome/browser/chromeos/policy/proto/chrome_device_policy.proto
index 3fbbaac..52ccfa3 100644
--- a/chrome/browser/chromeos/policy/proto/chrome_device_policy.proto
+++ b/chrome/browser/chromeos/policy/proto/chrome_device_policy.proto
@@ -561,8 +561,7 @@ message LoginScreenPowerManagementProto {
}
message AutoCleanupSettigsProto {
- // Configures strategy for automatic clean-up process that is run when device
- // runs out of free disk space. One of "remove-lru", "remove-lru-if-dormant".
+ // Deprecated. There is only one disk-full cleanup strategy: LRU.
optional string clean_up_strategy = 1;
}
diff --git a/components/policy/resources/policy_templates.json b/components/policy/resources/policy_templates.json
index a59a6e7..a3930d2 100644
--- a/components/policy/resources/policy_templates.json
+++ b/components/policy/resources/policy_templates.json
@@ -3663,16 +3663,19 @@
'caption': '''Least recently used users who have not logged in within last 3 months are removed until there is enough free space''',
},
],
- 'supported_on': ['chrome_os:32-'],
+ 'supported_on': ['chrome_os:32-35'],
'device_only': True,
'features': {
'dynamic_refresh': True,
'per_profile': False,
},
+ 'deprecated': True,
'example_value': 'remove-lru',
'id': 246,
- 'caption': '''Selects the strategy used to free up disk space during automatic clean-up''',
- 'desc': '''Controls the automatic clean-up behavior on <ph name="PRODUCT_OS_NAME">$2<ex>Google Chrome OS</ex></ph> devices. Automatic clean-up is triggered when the amount of free disk space reaches a critical level to recover some disk space.
+ 'caption': '''Selects the strategy used to free up disk space during automatic clean-up (deprecated)''',
+ 'desc': '''This policy is deprecated. <ph name="PRODUCT_OS_NAME">$2<ex>Google Chrome OS</ex></ph> will always use the 'RemoveLRU' clean-up strategy.
+
+ Controls the automatic clean-up behavior on <ph name="PRODUCT_OS_NAME">$2<ex>Google Chrome OS</ex></ph> devices. Automatic clean-up is triggered when the amount of free disk space reaches a critical level to recover some disk space.
If this policy is set to 'RemoveLRU', the automatic clean-up will keep removing users from the device in least-recently-logged-in order until there is enough free space.