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

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 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 base::Value::Type::INTEGER }, 170 base::Value::Type::INTEGER },
171 { key::kDefaultImagesSetting, 171 { key::kDefaultImagesSetting,
172 prefs::kManagedDefaultImagesSetting, 172 prefs::kManagedDefaultImagesSetting,
173 base::Value::Type::INTEGER }, 173 base::Value::Type::INTEGER },
174 { key::kDefaultPluginsSetting, 174 { key::kDefaultPluginsSetting,
175 prefs::kManagedDefaultPluginsSetting, 175 prefs::kManagedDefaultPluginsSetting,
176 base::Value::Type::INTEGER }, 176 base::Value::Type::INTEGER },
177 { key::kDefaultPopupsSetting, 177 { key::kDefaultPopupsSetting,
178 prefs::kManagedDefaultPopupsSetting, 178 prefs::kManagedDefaultPopupsSetting,
179 base::Value::Type::INTEGER }, 179 base::Value::Type::INTEGER },
180 { key::kDefaultKeygenSetting,
181 prefs::kManagedDefaultKeygenSetting,
182 base::Value::Type::INTEGER },
183 { key::kAutoSelectCertificateForUrls, 180 { key::kAutoSelectCertificateForUrls,
184 prefs::kManagedAutoSelectCertificateForUrls, 181 prefs::kManagedAutoSelectCertificateForUrls,
185 base::Value::Type::LIST }, 182 base::Value::Type::LIST },
186 { key::kCookiesAllowedForUrls, 183 { key::kCookiesAllowedForUrls,
187 prefs::kManagedCookiesAllowedForUrls, 184 prefs::kManagedCookiesAllowedForUrls,
188 base::Value::Type::LIST }, 185 base::Value::Type::LIST },
189 { key::kCookiesBlockedForUrls, 186 { key::kCookiesBlockedForUrls,
190 prefs::kManagedCookiesBlockedForUrls, 187 prefs::kManagedCookiesBlockedForUrls,
191 base::Value::Type::LIST }, 188 base::Value::Type::LIST },
192 { key::kCookiesSessionOnlyForUrls, 189 { key::kCookiesSessionOnlyForUrls,
(...skipping 16 matching lines...) Expand all
209 base::Value::Type::LIST }, 206 base::Value::Type::LIST },
210 { key::kPluginsBlockedForUrls, 207 { key::kPluginsBlockedForUrls,
211 prefs::kManagedPluginsBlockedForUrls, 208 prefs::kManagedPluginsBlockedForUrls,
212 base::Value::Type::LIST }, 209 base::Value::Type::LIST },
213 { key::kPopupsAllowedForUrls, 210 { key::kPopupsAllowedForUrls,
214 prefs::kManagedPopupsAllowedForUrls, 211 prefs::kManagedPopupsAllowedForUrls,
215 base::Value::Type::LIST }, 212 base::Value::Type::LIST },
216 { key::kPopupsBlockedForUrls, 213 { key::kPopupsBlockedForUrls,
217 prefs::kManagedPopupsBlockedForUrls, 214 prefs::kManagedPopupsBlockedForUrls,
218 base::Value::Type::LIST }, 215 base::Value::Type::LIST },
219 { key::kKeygenAllowedForUrls,
220 prefs::kManagedKeygenAllowedForUrls,
221 base::Value::Type::LIST },
222 { key::kKeygenBlockedForUrls,
223 prefs::kManagedKeygenBlockedForUrls,
224 base::Value::Type::LIST },
225 { key::kNotificationsAllowedForUrls, 216 { key::kNotificationsAllowedForUrls,
226 prefs::kManagedNotificationsAllowedForUrls, 217 prefs::kManagedNotificationsAllowedForUrls,
227 base::Value::Type::LIST }, 218 base::Value::Type::LIST },
228 { key::kNotificationsBlockedForUrls, 219 { key::kNotificationsBlockedForUrls,
229 prefs::kManagedNotificationsBlockedForUrls, 220 prefs::kManagedNotificationsBlockedForUrls,
230 base::Value::Type::LIST }, 221 base::Value::Type::LIST },
231 { key::kDefaultNotificationsSetting, 222 { key::kDefaultNotificationsSetting,
232 prefs::kManagedDefaultNotificationsSetting, 223 prefs::kManagedDefaultNotificationsSetting,
233 base::Value::Type::INTEGER }, 224 base::Value::Type::INTEGER },
234 { key::kDefaultGeolocationSetting, 225 { key::kDefaultGeolocationSetting,
(...skipping 699 matching lines...) Expand 10 before | Expand all | Expand 10 after
934 #endif // defined(OS_CHROMEOS) 925 #endif // defined(OS_CHROMEOS)
935 926
936 #if BUILDFLAG(ENABLE_PLUGINS) 927 #if BUILDFLAG(ENABLE_PLUGINS)
937 handlers->AddHandler(base::MakeUnique<PluginPolicyHandler>()); 928 handlers->AddHandler(base::MakeUnique<PluginPolicyHandler>());
938 #endif // BUILDFLAG(ENABLE_PLUGINS) 929 #endif // BUILDFLAG(ENABLE_PLUGINS)
939 930
940 return handlers; 931 return handlers;
941 } 932 }
942 933
943 } // namespace policy 934 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698