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

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

Issue 7537025: Add new Content settings type AUTO-SUBMIT-CERTIFICATE (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: " Created 9 years, 4 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 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 { Value::TYPE_INTEGER, kPolicyDefaultCookiesSetting, 222 { Value::TYPE_INTEGER, kPolicyDefaultCookiesSetting,
223 prefs::kManagedDefaultCookiesSetting }, 223 prefs::kManagedDefaultCookiesSetting },
224 { Value::TYPE_INTEGER, kPolicyDefaultImagesSetting, 224 { Value::TYPE_INTEGER, kPolicyDefaultImagesSetting,
225 prefs::kManagedDefaultImagesSetting }, 225 prefs::kManagedDefaultImagesSetting },
226 { Value::TYPE_INTEGER, kPolicyDefaultJavaScriptSetting, 226 { Value::TYPE_INTEGER, kPolicyDefaultJavaScriptSetting,
227 prefs::kManagedDefaultJavaScriptSetting }, 227 prefs::kManagedDefaultJavaScriptSetting },
228 { Value::TYPE_INTEGER, kPolicyDefaultPluginsSetting, 228 { Value::TYPE_INTEGER, kPolicyDefaultPluginsSetting,
229 prefs::kManagedDefaultPluginsSetting }, 229 prefs::kManagedDefaultPluginsSetting },
230 { Value::TYPE_INTEGER, kPolicyDefaultPopupsSetting, 230 { Value::TYPE_INTEGER, kPolicyDefaultPopupsSetting,
231 prefs::kManagedDefaultPopupsSetting }, 231 prefs::kManagedDefaultPopupsSetting },
232 { Value::TYPE_INTEGER, kPolicyDefaultAutoSelectCertificateSetting,
233 prefs::kManagedDefaultAutoSelectCertificateSetting },
234 { Value::TYPE_LIST, kPolicyAutoSelectCertificateForUrls,
235 prefs::kManagedAutoSelectCertificateForUrls},
232 { Value::TYPE_LIST, kPolicyCookiesAllowedForUrls, 236 { Value::TYPE_LIST, kPolicyCookiesAllowedForUrls,
233 prefs::kManagedCookiesAllowedForUrls }, 237 prefs::kManagedCookiesAllowedForUrls },
234 { Value::TYPE_LIST, kPolicyCookiesBlockedForUrls, 238 { Value::TYPE_LIST, kPolicyCookiesBlockedForUrls,
235 prefs::kManagedCookiesBlockedForUrls }, 239 prefs::kManagedCookiesBlockedForUrls },
236 { Value::TYPE_LIST, kPolicyCookiesSessionOnlyForUrls, 240 { Value::TYPE_LIST, kPolicyCookiesSessionOnlyForUrls,
237 prefs::kManagedCookiesSessionOnlyForUrls }, 241 prefs::kManagedCookiesSessionOnlyForUrls },
238 { Value::TYPE_LIST, kPolicyImagesAllowedForUrls, 242 { Value::TYPE_LIST, kPolicyImagesAllowedForUrls,
239 prefs::kManagedImagesAllowedForUrls }, 243 prefs::kManagedImagesAllowedForUrls },
240 { Value::TYPE_LIST, kPolicyImagesBlockedForUrls, 244 { Value::TYPE_LIST, kPolicyImagesBlockedForUrls,
241 prefs::kManagedImagesBlockedForUrls }, 245 prefs::kManagedImagesBlockedForUrls },
(...skipping 855 matching lines...) Expand 10 before | Expand all | Expand 10 after
1097 { kPolicyDefaultJavaScriptSetting, Value::TYPE_INTEGER, 1101 { kPolicyDefaultJavaScriptSetting, Value::TYPE_INTEGER,
1098 key::kDefaultJavaScriptSetting }, 1102 key::kDefaultJavaScriptSetting },
1099 { kPolicyDefaultPluginsSetting, Value::TYPE_INTEGER, 1103 { kPolicyDefaultPluginsSetting, Value::TYPE_INTEGER,
1100 key::kDefaultPluginsSetting }, 1104 key::kDefaultPluginsSetting },
1101 { kPolicyDefaultPopupsSetting, Value::TYPE_INTEGER, 1105 { kPolicyDefaultPopupsSetting, Value::TYPE_INTEGER,
1102 key::kDefaultPopupsSetting }, 1106 key::kDefaultPopupsSetting },
1103 { kPolicyDefaultNotificationsSetting, Value::TYPE_INTEGER, 1107 { kPolicyDefaultNotificationsSetting, Value::TYPE_INTEGER,
1104 key::kDefaultNotificationsSetting }, 1108 key::kDefaultNotificationsSetting },
1105 { kPolicyDefaultGeolocationSetting, Value::TYPE_INTEGER, 1109 { kPolicyDefaultGeolocationSetting, Value::TYPE_INTEGER,
1106 key::kDefaultGeolocationSetting }, 1110 key::kDefaultGeolocationSetting },
1111 { kPolicyDefaultAutoSelectCertificateSetting, Value::TYPE_INTEGER,
1112 key::kDefaultAutoSelectCertificateSetting},
1113 { kPolicyAutoSelectCertificateForUrls, Value::TYPE_LIST,
1114 key::kAutoSelectCertificateForUrls},
1107 { kPolicyCookiesAllowedForUrls, Value::TYPE_LIST, 1115 { kPolicyCookiesAllowedForUrls, Value::TYPE_LIST,
1108 key::kCookiesAllowedForUrls }, 1116 key::kCookiesAllowedForUrls },
1109 { kPolicyCookiesBlockedForUrls, Value::TYPE_LIST, 1117 { kPolicyCookiesBlockedForUrls, Value::TYPE_LIST,
1110 key::kCookiesBlockedForUrls }, 1118 key::kCookiesBlockedForUrls },
1111 { kPolicyCookiesSessionOnlyForUrls, Value::TYPE_LIST, 1119 { kPolicyCookiesSessionOnlyForUrls, Value::TYPE_LIST,
1112 key::kCookiesSessionOnlyForUrls }, 1120 key::kCookiesSessionOnlyForUrls },
1113 { kPolicyImagesAllowedForUrls, Value::TYPE_LIST, 1121 { kPolicyImagesAllowedForUrls, Value::TYPE_LIST,
1114 key::kImagesAllowedForUrls }, 1122 key::kImagesAllowedForUrls },
1115 { kPolicyImagesBlockedForUrls, Value::TYPE_LIST, 1123 { kPolicyImagesBlockedForUrls, Value::TYPE_LIST,
1116 key::kImagesBlockedForUrls }, 1124 key::kImagesBlockedForUrls },
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
1232 // Update the initialization flag. 1240 // Update the initialization flag.
1233 if (!initialization_complete_ && 1241 if (!initialization_complete_ &&
1234 provider_->IsInitializationComplete()) { 1242 provider_->IsInitializationComplete()) {
1235 initialization_complete_ = true; 1243 initialization_complete_ = true;
1236 FOR_EACH_OBSERVER(PrefStore::Observer, observers_, 1244 FOR_EACH_OBSERVER(PrefStore::Observer, observers_,
1237 OnInitializationCompleted(true)); 1245 OnInitializationCompleted(true));
1238 } 1246 }
1239 } 1247 }
1240 1248
1241 } // namespace policy 1249 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698