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

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

Issue 2536993002: Remove support for the keygen tag (Closed)
Patch Set: Rebased Created 4 years 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_handler_list_factory.h" 5 #include "chrome/browser/policy/configuration_policy_handler_list_factory.h"
6 6
7 #include <limits.h> 7 #include <limits.h>
8 #include <stddef.h> 8 #include <stddef.h>
9 9
10 #include <utility> 10 #include <utility>
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 base::Value::TYPE_INTEGER }, 169 base::Value::TYPE_INTEGER },
170 { key::kDefaultImagesSetting, 170 { key::kDefaultImagesSetting,
171 prefs::kManagedDefaultImagesSetting, 171 prefs::kManagedDefaultImagesSetting,
172 base::Value::TYPE_INTEGER }, 172 base::Value::TYPE_INTEGER },
173 { key::kDefaultPluginsSetting, 173 { key::kDefaultPluginsSetting,
174 prefs::kManagedDefaultPluginsSetting, 174 prefs::kManagedDefaultPluginsSetting,
175 base::Value::TYPE_INTEGER }, 175 base::Value::TYPE_INTEGER },
176 { key::kDefaultPopupsSetting, 176 { key::kDefaultPopupsSetting,
177 prefs::kManagedDefaultPopupsSetting, 177 prefs::kManagedDefaultPopupsSetting,
178 base::Value::TYPE_INTEGER }, 178 base::Value::TYPE_INTEGER },
179 { key::kDefaultKeygenSetting,
180 prefs::kManagedDefaultKeygenSetting,
181 base::Value::TYPE_INTEGER },
182 { key::kAutoSelectCertificateForUrls, 179 { key::kAutoSelectCertificateForUrls,
183 prefs::kManagedAutoSelectCertificateForUrls, 180 prefs::kManagedAutoSelectCertificateForUrls,
184 base::Value::TYPE_LIST }, 181 base::Value::TYPE_LIST },
185 { key::kCookiesAllowedForUrls, 182 { key::kCookiesAllowedForUrls,
186 prefs::kManagedCookiesAllowedForUrls, 183 prefs::kManagedCookiesAllowedForUrls,
187 base::Value::TYPE_LIST }, 184 base::Value::TYPE_LIST },
188 { key::kCookiesBlockedForUrls, 185 { key::kCookiesBlockedForUrls,
189 prefs::kManagedCookiesBlockedForUrls, 186 prefs::kManagedCookiesBlockedForUrls,
190 base::Value::TYPE_LIST }, 187 base::Value::TYPE_LIST },
191 { key::kCookiesSessionOnlyForUrls, 188 { key::kCookiesSessionOnlyForUrls,
(...skipping 16 matching lines...) Expand all
208 base::Value::TYPE_LIST }, 205 base::Value::TYPE_LIST },
209 { key::kPluginsBlockedForUrls, 206 { key::kPluginsBlockedForUrls,
210 prefs::kManagedPluginsBlockedForUrls, 207 prefs::kManagedPluginsBlockedForUrls,
211 base::Value::TYPE_LIST }, 208 base::Value::TYPE_LIST },
212 { key::kPopupsAllowedForUrls, 209 { key::kPopupsAllowedForUrls,
213 prefs::kManagedPopupsAllowedForUrls, 210 prefs::kManagedPopupsAllowedForUrls,
214 base::Value::TYPE_LIST }, 211 base::Value::TYPE_LIST },
215 { key::kPopupsBlockedForUrls, 212 { key::kPopupsBlockedForUrls,
216 prefs::kManagedPopupsBlockedForUrls, 213 prefs::kManagedPopupsBlockedForUrls,
217 base::Value::TYPE_LIST }, 214 base::Value::TYPE_LIST },
218 { key::kKeygenAllowedForUrls,
219 prefs::kManagedKeygenAllowedForUrls,
220 base::Value::TYPE_LIST },
221 { key::kKeygenBlockedForUrls,
222 prefs::kManagedKeygenBlockedForUrls,
223 base::Value::TYPE_LIST },
224 { key::kNotificationsAllowedForUrls, 215 { key::kNotificationsAllowedForUrls,
225 prefs::kManagedNotificationsAllowedForUrls, 216 prefs::kManagedNotificationsAllowedForUrls,
226 base::Value::TYPE_LIST }, 217 base::Value::TYPE_LIST },
227 { key::kNotificationsBlockedForUrls, 218 { key::kNotificationsBlockedForUrls,
228 prefs::kManagedNotificationsBlockedForUrls, 219 prefs::kManagedNotificationsBlockedForUrls,
229 base::Value::TYPE_LIST }, 220 base::Value::TYPE_LIST },
230 { key::kDefaultNotificationsSetting, 221 { key::kDefaultNotificationsSetting,
231 prefs::kManagedDefaultNotificationsSetting, 222 prefs::kManagedDefaultNotificationsSetting,
232 base::Value::TYPE_INTEGER }, 223 base::Value::TYPE_INTEGER },
233 { key::kDefaultGeolocationSetting, 224 { key::kDefaultGeolocationSetting,
(...skipping 694 matching lines...) Expand 10 before | Expand all | Expand 10 after
928 #endif // defined(OS_CHROMEOS) 919 #endif // defined(OS_CHROMEOS)
929 920
930 #if BUILDFLAG(ENABLE_PLUGINS) 921 #if BUILDFLAG(ENABLE_PLUGINS)
931 handlers->AddHandler(base::MakeUnique<PluginPolicyHandler>()); 922 handlers->AddHandler(base::MakeUnique<PluginPolicyHandler>());
932 #endif // BUILDFLAG(ENABLE_PLUGINS) 923 #endif // BUILDFLAG(ENABLE_PLUGINS)
933 924
934 return handlers; 925 return handlers;
935 } 926 }
936 927
937 } // namespace policy 928 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698