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

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 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 base::Value::Type::INTEGER }, 171 base::Value::Type::INTEGER },
172 { key::kDefaultImagesSetting, 172 { key::kDefaultImagesSetting,
173 prefs::kManagedDefaultImagesSetting, 173 prefs::kManagedDefaultImagesSetting,
174 base::Value::Type::INTEGER }, 174 base::Value::Type::INTEGER },
175 { key::kDefaultPluginsSetting, 175 { key::kDefaultPluginsSetting,
176 prefs::kManagedDefaultPluginsSetting, 176 prefs::kManagedDefaultPluginsSetting,
177 base::Value::Type::INTEGER }, 177 base::Value::Type::INTEGER },
178 { key::kDefaultPopupsSetting, 178 { key::kDefaultPopupsSetting,
179 prefs::kManagedDefaultPopupsSetting, 179 prefs::kManagedDefaultPopupsSetting,
180 base::Value::Type::INTEGER }, 180 base::Value::Type::INTEGER },
181 { key::kDefaultKeygenSetting,
182 prefs::kManagedDefaultKeygenSetting,
183 base::Value::Type::INTEGER },
184 { key::kAutoSelectCertificateForUrls, 181 { key::kAutoSelectCertificateForUrls,
185 prefs::kManagedAutoSelectCertificateForUrls, 182 prefs::kManagedAutoSelectCertificateForUrls,
186 base::Value::Type::LIST }, 183 base::Value::Type::LIST },
187 { key::kCookiesAllowedForUrls, 184 { key::kCookiesAllowedForUrls,
188 prefs::kManagedCookiesAllowedForUrls, 185 prefs::kManagedCookiesAllowedForUrls,
189 base::Value::Type::LIST }, 186 base::Value::Type::LIST },
190 { key::kCookiesBlockedForUrls, 187 { key::kCookiesBlockedForUrls,
191 prefs::kManagedCookiesBlockedForUrls, 188 prefs::kManagedCookiesBlockedForUrls,
192 base::Value::Type::LIST }, 189 base::Value::Type::LIST },
193 { key::kCookiesSessionOnlyForUrls, 190 { key::kCookiesSessionOnlyForUrls,
(...skipping 16 matching lines...) Expand all
210 base::Value::Type::LIST }, 207 base::Value::Type::LIST },
211 { key::kPluginsBlockedForUrls, 208 { key::kPluginsBlockedForUrls,
212 prefs::kManagedPluginsBlockedForUrls, 209 prefs::kManagedPluginsBlockedForUrls,
213 base::Value::Type::LIST }, 210 base::Value::Type::LIST },
214 { key::kPopupsAllowedForUrls, 211 { key::kPopupsAllowedForUrls,
215 prefs::kManagedPopupsAllowedForUrls, 212 prefs::kManagedPopupsAllowedForUrls,
216 base::Value::Type::LIST }, 213 base::Value::Type::LIST },
217 { key::kPopupsBlockedForUrls, 214 { key::kPopupsBlockedForUrls,
218 prefs::kManagedPopupsBlockedForUrls, 215 prefs::kManagedPopupsBlockedForUrls,
219 base::Value::Type::LIST }, 216 base::Value::Type::LIST },
220 { key::kKeygenAllowedForUrls,
221 prefs::kManagedKeygenAllowedForUrls,
222 base::Value::Type::LIST },
223 { key::kKeygenBlockedForUrls,
224 prefs::kManagedKeygenBlockedForUrls,
225 base::Value::Type::LIST },
226 { key::kNotificationsAllowedForUrls, 217 { key::kNotificationsAllowedForUrls,
227 prefs::kManagedNotificationsAllowedForUrls, 218 prefs::kManagedNotificationsAllowedForUrls,
228 base::Value::Type::LIST }, 219 base::Value::Type::LIST },
229 { key::kNotificationsBlockedForUrls, 220 { key::kNotificationsBlockedForUrls,
230 prefs::kManagedNotificationsBlockedForUrls, 221 prefs::kManagedNotificationsBlockedForUrls,
231 base::Value::Type::LIST }, 222 base::Value::Type::LIST },
232 { key::kDefaultNotificationsSetting, 223 { key::kDefaultNotificationsSetting,
233 prefs::kManagedDefaultNotificationsSetting, 224 prefs::kManagedDefaultNotificationsSetting,
234 base::Value::Type::INTEGER }, 225 base::Value::Type::INTEGER },
235 { key::kDefaultGeolocationSetting, 226 { key::kDefaultGeolocationSetting,
(...skipping 750 matching lines...) Expand 10 before | Expand all | Expand 10 after
986 #endif // defined(OS_CHROMEOS) 977 #endif // defined(OS_CHROMEOS)
987 978
988 #if BUILDFLAG(ENABLE_PLUGINS) 979 #if BUILDFLAG(ENABLE_PLUGINS)
989 handlers->AddHandler(base::MakeUnique<PluginPolicyHandler>()); 980 handlers->AddHandler(base::MakeUnique<PluginPolicyHandler>());
990 #endif // BUILDFLAG(ENABLE_PLUGINS) 981 #endif // BUILDFLAG(ENABLE_PLUGINS)
991 982
992 return handlers; 983 return handlers;
993 } 984 }
994 985
995 } // namespace policy 986 } // namespace policy
OLDNEW
« no previous file with comments | « chrome/browser/content_settings/tab_specific_content_settings_unittest.cc ('k') | chrome/browser/profiles/profile_io_data.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698