summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcmasone@chromium.org <cmasone@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-11 18:19:53 +0000
committercmasone@chromium.org <cmasone@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-11 18:19:53 +0000
commit79538568397b04e8938c487bdd820ba96c933dcb (patch)
treec615346a35f5dd447ddabfdb9fe6714a47ef0771
parentc6366b66124eea2d037441fd700ac6defbb1b373 (diff)
downloadchromium_src-79538568397b04e8938c487bdd820ba96c933dcb.zip
chromium_src-79538568397b04e8938c487bdd820ba96c933dcb.tar.gz
chromium_src-79538568397b04e8938c487bdd820ba96c933dcb.tar.bz2
[Chrome OS] Add currently-supported signed settings to device policy proto
Drawing from the lists of preferences in user_cros_settings_provider.cc, this adds the remaining boolean prefs to our device policy protobuf definition. BUG=13230 TEST=build chrome R=jkummerow@chromium.org Review URL: http://codereview.chromium.org/6821049 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81121 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/policy/proto/chrome_device_policy.proto16
1 files changed, 15 insertions, 1 deletions
diff --git a/chrome/browser/policy/proto/chrome_device_policy.proto b/chrome/browser/policy/proto/chrome_device_policy.proto
index 07864f6..a6cdbe3 100644
--- a/chrome/browser/policy/proto/chrome_device_policy.proto
+++ b/chrome/browser/policy/proto/chrome_device_policy.proto
@@ -19,9 +19,21 @@ message UserWhitelistProto {
message GuestModeEnabledProto {
// Determines if guests are allowed to log in to the device.
+ // Should default to true.
optional bool guest_mode_enabled = 1;
}
+message ShowUserNamesOnSigninProto {
+ // Determines if we show pods for existing users on the sign in screen.
+ // Should default to true.
+ optional bool show_user_names = 1;
+}
+
+message DataRoamingEnabledProto {
+ // Determines if cellular data roaming is enabled. Should default to false.
+ optional bool data_roaming_enabled = 1;
+}
+
message DeviceProxySettingsProto {
// One of "direct", "auto_detect", "pac_script", "fixed_servers", "system"
optional string proxy_mode = 1;
@@ -35,4 +47,6 @@ message ChromeDeviceSettingsProto {
optional UserWhitelistProto user_whitelist = 2;
optional GuestModeEnabledProto guest_mode_enabled = 3;
optional DeviceProxySettingsProto device_proxy_settings = 4;
-} \ No newline at end of file
+ optional ShowUserNamesOnSigninProto show_user_names = 5;
+ optional DataRoamingEnabledProto data_roaming_enabled = 6;
+}