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

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

Issue 9668001: Add a new policy to allow for release channel delegation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ToT rebase. Created 8 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 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 optional bool camera_enabled = 1; 71 optional bool camera_enabled = 1;
72 } 72 }
73 73
74 message MetricsEnabledProto { 74 message MetricsEnabledProto {
75 optional bool metrics_enabled = 1; 75 optional bool metrics_enabled = 1;
76 } 76 }
77 77
78 message ReleaseChannelProto { 78 message ReleaseChannelProto {
79 // One of "stable-channel", "beta-channel", or "dev-channel" 79 // One of "stable-channel", "beta-channel", or "dev-channel"
80 optional string release_channel = 1; 80 optional string release_channel = 1;
81
82 // If |user_delegated| is set to true and the |release_channel| field is not
83 // set or left empty, the user can select the channel. If the
84 // |release_channel| is specified it will always override users choice!
85 optional bool release_channel_delegated = 2;
81 } 86 }
82 87
83 message DeviceOpenNetworkConfigurationProto { 88 message DeviceOpenNetworkConfigurationProto {
84 // The network configuration blob. This is a JSON string as specified by ONC. 89 // The network configuration blob. This is a JSON string as specified by ONC.
85 optional string open_network_configuration = 1; 90 optional string open_network_configuration = 1;
86 } 91 }
87 92
88 // Policies to turn on portions of the device status reports. 93 // Policies to turn on portions of the device status reports.
89 message DeviceReportingProto { 94 message DeviceReportingProto {
90 optional bool report_version_info = 1; 95 optional bool report_version_info = 1;
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 optional AllowNewUsersProto allow_new_users = 8; 150 optional AllowNewUsersProto allow_new_users = 8;
146 optional MetricsEnabledProto metrics_enabled = 9; 151 optional MetricsEnabledProto metrics_enabled = 9;
147 optional ReleaseChannelProto release_channel = 10; 152 optional ReleaseChannelProto release_channel = 10;
148 optional DeviceOpenNetworkConfigurationProto open_network_configuration = 11; 153 optional DeviceOpenNetworkConfigurationProto open_network_configuration = 11;
149 optional DeviceReportingProto device_reporting = 12; 154 optional DeviceReportingProto device_reporting = 12;
150 optional EphemeralUsersEnabledProto ephemeral_users_enabled = 13; 155 optional EphemeralUsersEnabledProto ephemeral_users_enabled = 13;
151 optional AppPackProto app_pack = 14; 156 optional AppPackProto app_pack = 14;
152 optional ForcedLogoutTimeoutsProto forced_logout_timeouts = 15; 157 optional ForcedLogoutTimeoutsProto forced_logout_timeouts = 15;
153 optional ScreenSaverProto login_screen_saver = 16; 158 optional ScreenSaverProto login_screen_saver = 16;
154 } 159 }
OLDNEW
« no previous file with comments | « chrome/browser/policy/device_policy_cache.cc ('k') | chrome/browser/ui/webui/help/help_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698