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

Side by Side Diff: chrome/browser/policy/configuration_policy_pref_store.cc

Issue 7287001: Add a device policy for specifying the release channel. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Change inconsistent wording in policy template. Created 9 years, 5 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #include "chrome/browser/policy/configuration_policy_pref_store.h" 5 #include "chrome/browser/policy/configuration_policy_pref_store.h"
6 6
7 #include <map> 7 #include <map>
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 1051 matching lines...) Expand 10 before | Expand all | Expand 10 after
1062 { kPolicyEditBookmarksEnabled, Value::TYPE_BOOLEAN, 1062 { kPolicyEditBookmarksEnabled, Value::TYPE_BOOLEAN,
1063 key::kEditBookmarksEnabled }, 1063 key::kEditBookmarksEnabled },
1064 { kPolicyAllowFileSelectionDialogs, Value::TYPE_BOOLEAN, 1064 { kPolicyAllowFileSelectionDialogs, Value::TYPE_BOOLEAN,
1065 key::kAllowFileSelectionDialogs }, 1065 key::kAllowFileSelectionDialogs },
1066 { kPolicyDiskCacheDir, Value::TYPE_STRING, 1066 { kPolicyDiskCacheDir, Value::TYPE_STRING,
1067 key::kDiskCacheDir }, 1067 key::kDiskCacheDir },
1068 1068
1069 #if defined(OS_CHROMEOS) 1069 #if defined(OS_CHROMEOS)
1070 { kPolicyChromeOsLockOnIdleSuspend, Value::TYPE_BOOLEAN, 1070 { kPolicyChromeOsLockOnIdleSuspend, Value::TYPE_BOOLEAN,
1071 key::kChromeOsLockOnIdleSuspend }, 1071 key::kChromeOsLockOnIdleSuspend },
1072 { kPolicyChromeOsReleaseChannel, Value::TYPE_STRING,
1073 key::kChromeOsReleaseChannel },
1072 #endif 1074 #endif
1073 }; 1075 };
1074 1076
1075 static ConfigurationPolicyProvider::PolicyDefinitionList policy_list = { 1077 static ConfigurationPolicyProvider::PolicyDefinitionList policy_list = {
1076 entries, 1078 entries,
1077 entries + arraysize(entries), 1079 entries + arraysize(entries),
1078 }; 1080 };
1079 return &policy_list; 1081 return &policy_list;
1080 } 1082 }
1081 1083
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
1124 // Update the initialization flag. 1126 // Update the initialization flag.
1125 if (!initialization_complete_ && 1127 if (!initialization_complete_ &&
1126 provider_->IsInitializationComplete()) { 1128 provider_->IsInitializationComplete()) {
1127 initialization_complete_ = true; 1129 initialization_complete_ = true;
1128 FOR_EACH_OBSERVER(PrefStore::Observer, observers_, 1130 FOR_EACH_OBSERVER(PrefStore::Observer, observers_,
1129 OnInitializationCompleted(true)); 1131 OnInitializationCompleted(true));
1130 } 1132 }
1131 } 1133 }
1132 1134
1133 } // namespace policy 1135 } // namespace policy
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/user_cros_settings_provider.cc ('k') | chrome/browser/policy/device_policy_cache.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698