Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 1079 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1090 { kPolicyEditBookmarksEnabled, Value::TYPE_BOOLEAN, | 1090 { kPolicyEditBookmarksEnabled, Value::TYPE_BOOLEAN, |
| 1091 key::kEditBookmarksEnabled }, | 1091 key::kEditBookmarksEnabled }, |
| 1092 { kPolicyAllowFileSelectionDialogs, Value::TYPE_BOOLEAN, | 1092 { kPolicyAllowFileSelectionDialogs, Value::TYPE_BOOLEAN, |
| 1093 key::kAllowFileSelectionDialogs }, | 1093 key::kAllowFileSelectionDialogs }, |
| 1094 { kPolicyDiskCacheDir, Value::TYPE_STRING, | 1094 { kPolicyDiskCacheDir, Value::TYPE_STRING, |
| 1095 key::kDiskCacheDir }, | 1095 key::kDiskCacheDir }, |
| 1096 | 1096 |
| 1097 #if defined(OS_CHROMEOS) | 1097 #if defined(OS_CHROMEOS) |
| 1098 { kPolicyChromeOsLockOnIdleSuspend, Value::TYPE_BOOLEAN, | 1098 { kPolicyChromeOsLockOnIdleSuspend, Value::TYPE_BOOLEAN, |
| 1099 key::kChromeOsLockOnIdleSuspend }, | 1099 key::kChromeOsLockOnIdleSuspend }, |
| 1100 { kPolicyChromeOsReleaseChannel, Value::TYPE_STRING, | |
| 1101 key::kChromeOsReleaseChannel }, | |
|
gfeher
2011/06/29 16:28:16
You'll need to remove this when you change the JSO
| |
| 1100 #endif | 1102 #endif |
| 1101 }; | 1103 }; |
| 1102 | 1104 |
| 1103 static ConfigurationPolicyProvider::PolicyDefinitionList policy_list = { | 1105 static ConfigurationPolicyProvider::PolicyDefinitionList policy_list = { |
| 1104 entries, | 1106 entries, |
| 1105 entries + arraysize(entries), | 1107 entries + arraysize(entries), |
| 1106 }; | 1108 }; |
| 1107 return &policy_list; | 1109 return &policy_list; |
| 1108 } | 1110 } |
| 1109 | 1111 |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1143 // Update the initialization flag. | 1145 // Update the initialization flag. |
| 1144 if (!initialization_complete_ && | 1146 if (!initialization_complete_ && |
| 1145 provider_->IsInitializationComplete()) { | 1147 provider_->IsInitializationComplete()) { |
| 1146 initialization_complete_ = true; | 1148 initialization_complete_ = true; |
| 1147 FOR_EACH_OBSERVER(PrefStore::Observer, observers_, | 1149 FOR_EACH_OBSERVER(PrefStore::Observer, observers_, |
| 1148 OnInitializationCompleted(true)); | 1150 OnInitializationCompleted(true)); |
| 1149 } | 1151 } |
| 1150 } | 1152 } |
| 1151 | 1153 |
| 1152 } // namespace policy | 1154 } // namespace policy |
| OLD | NEW |