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

Side by Side Diff: chrome/browser/policy/proto/chrome_device_policy.proto

Issue 12728008: Revert 186837 "Move pref backing up flags from local state to de..." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 9 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 syntax = "proto2"; 5 syntax = "proto2";
6 6
7 option optimize_for = LITE_RUNTIME; 7 option optimize_for = LITE_RUNTIME;
8 8
9 package enterprise_management; 9 package enterprise_management;
10 10
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after
238 } 238 }
239 239
240 message AllowRedeemChromeOsRegistrationOffersProto { 240 message AllowRedeemChromeOsRegistrationOffersProto {
241 // Chrome OS Registration service provides way for chromeos device users 241 // Chrome OS Registration service provides way for chromeos device users
242 // to redeem electronic offers provided by service provider. 242 // to redeem electronic offers provided by service provider.
243 // This value determines if users are allowed to redeem offers through 243 // This value determines if users are allowed to redeem offers through
244 // Chrome OS Registration service. 244 // Chrome OS Registration service.
245 optional bool allow_redeem_offers = 1 [default = true]; 245 optional bool allow_redeem_offers = 1 [default = true];
246 } 246 }
247 247
248 message StartUpFlagsProto {
249 // The list of flags to be applied to chrome on start-up (back up store for
250 // owner set flags in about:flags).
251 repeated string flags = 1;
252 }
253
254 message ChromeDeviceSettingsProto { 248 message ChromeDeviceSettingsProto {
255 optional DevicePolicyRefreshRateProto device_policy_refresh_rate = 1; 249 optional DevicePolicyRefreshRateProto device_policy_refresh_rate = 1;
256 optional UserWhitelistProto user_whitelist = 2; 250 optional UserWhitelistProto user_whitelist = 2;
257 optional GuestModeEnabledProto guest_mode_enabled = 3; 251 optional GuestModeEnabledProto guest_mode_enabled = 3;
258 optional DeviceProxySettingsProto device_proxy_settings = 4; 252 optional DeviceProxySettingsProto device_proxy_settings = 4;
259 optional CameraEnabledProto camera_enabled = 5; 253 optional CameraEnabledProto camera_enabled = 5;
260 optional ShowUserNamesOnSigninProto show_user_names = 6; 254 optional ShowUserNamesOnSigninProto show_user_names = 6;
261 optional DataRoamingEnabledProto data_roaming_enabled = 7; 255 optional DataRoamingEnabledProto data_roaming_enabled = 7;
262 optional AllowNewUsersProto allow_new_users = 8; 256 optional AllowNewUsersProto allow_new_users = 8;
263 optional MetricsEnabledProto metrics_enabled = 9; 257 optional MetricsEnabledProto metrics_enabled = 9;
264 optional ReleaseChannelProto release_channel = 10; 258 optional ReleaseChannelProto release_channel = 10;
265 optional DeviceOpenNetworkConfigurationProto open_network_configuration = 11; 259 optional DeviceOpenNetworkConfigurationProto open_network_configuration = 11;
266 optional DeviceReportingProto device_reporting = 12; 260 optional DeviceReportingProto device_reporting = 12;
267 optional EphemeralUsersEnabledProto ephemeral_users_enabled = 13; 261 optional EphemeralUsersEnabledProto ephemeral_users_enabled = 13;
268 optional AppPackProto app_pack = 14; 262 optional AppPackProto app_pack = 14;
269 optional ForcedLogoutTimeoutsProto forced_logout_timeouts = 15; 263 optional ForcedLogoutTimeoutsProto forced_logout_timeouts = 15;
270 optional ScreenSaverProto login_screen_saver = 16; 264 optional ScreenSaverProto login_screen_saver = 16;
271 optional AutoUpdateSettingsProto auto_update_settings = 17; 265 optional AutoUpdateSettingsProto auto_update_settings = 17;
272 optional StartUpUrlsProto start_up_urls = 18; 266 optional StartUpUrlsProto start_up_urls = 18;
273 optional PinnedAppsProto pinned_apps = 19; 267 optional PinnedAppsProto pinned_apps = 19;
274 optional SystemTimezoneProto system_timezone = 20; 268 optional SystemTimezoneProto system_timezone = 20;
275 optional DeviceLocalAccountsProto device_local_accounts = 21; 269 optional DeviceLocalAccountsProto device_local_accounts = 21;
276 optional AllowRedeemChromeOsRegistrationOffersProto allow_redeem_offers = 22; 270 optional AllowRedeemChromeOsRegistrationOffersProto allow_redeem_offers = 22;
277 optional StartUpFlagsProto start_up_flags = 23;
278 } 271 }
OLDNEW
« no previous file with comments | « chrome/browser/policy/device_policy_decoder_chromeos.cc ('k') | chrome/browser/ui/webui/flags_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698