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

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

Issue 10694107: Revert 145523 - Add a policy to disable proceeding through the Safe Browsing interstitials. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 5 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
« no previous file with comments | « chrome/app/policy/policy_templates.json ('k') | chrome/browser/profiles/profile.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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.h" 5 #include "chrome/browser/policy/configuration_policy_handler_list.h"
6 6
7 #include "base/stl_util.h" 7 #include "base/stl_util.h"
8 #include "base/values.h" 8 #include "base/values.h"
9 #include "chrome/browser/policy/configuration_policy_handler.h" 9 #include "chrome/browser/policy/configuration_policy_handler.h"
10 #include "chrome/browser/policy/policy_error_map.h" 10 #include "chrome/browser/policy/policy_error_map.h"
(...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after
278 Value::TYPE_STRING }, 278 Value::TYPE_STRING },
279 { key::kEnableMemoryInfo, 279 { key::kEnableMemoryInfo,
280 prefs::kEnableMemoryInfo, 280 prefs::kEnableMemoryInfo,
281 Value::TYPE_BOOLEAN }, 281 Value::TYPE_BOOLEAN },
282 { key::kRestrictSigninToPattern, 282 { key::kRestrictSigninToPattern,
283 prefs::kGoogleServicesUsernamePattern, 283 prefs::kGoogleServicesUsernamePattern,
284 Value::TYPE_STRING }, 284 Value::TYPE_STRING },
285 { key::kDefaultMediaStreamSetting, 285 { key::kDefaultMediaStreamSetting,
286 prefs::kManagedDefaultMediaStreamSetting, 286 prefs::kManagedDefaultMediaStreamSetting,
287 Value::TYPE_INTEGER }, 287 Value::TYPE_INTEGER },
288 { key::kDisableSafeBrowsingProceedAnyway,
289 prefs::kSafeBrowsingProceedAnywayDisabled,
290 Value::TYPE_BOOLEAN },
291 288
292 #if defined(OS_CHROMEOS) 289 #if defined(OS_CHROMEOS)
293 { key::kChromeOsLockOnIdleSuspend, 290 { key::kChromeOsLockOnIdleSuspend,
294 prefs::kEnableScreenLock, 291 prefs::kEnableScreenLock,
295 Value::TYPE_BOOLEAN }, 292 Value::TYPE_BOOLEAN },
296 { key::kChromeOsReleaseChannel, 293 { key::kChromeOsReleaseChannel,
297 prefs::kChromeOsReleaseChannel, 294 prefs::kChromeOsReleaseChannel,
298 Value::TYPE_STRING }, 295 Value::TYPE_STRING },
299 { key::kGDataDisabled, 296 { key::kGDataDisabled,
300 prefs::kDisableGData, 297 prefs::kDisableGData,
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
389 } 386 }
390 387
391 void ConfigurationPolicyHandlerList::PrepareForDisplaying( 388 void ConfigurationPolicyHandlerList::PrepareForDisplaying(
392 PolicyMap* policies) const { 389 PolicyMap* policies) const {
393 std::vector<ConfigurationPolicyHandler*>::const_iterator handler; 390 std::vector<ConfigurationPolicyHandler*>::const_iterator handler;
394 for (handler = handlers_.begin(); handler != handlers_.end(); ++handler) 391 for (handler = handlers_.begin(); handler != handlers_.end(); ++handler)
395 (*handler)->PrepareForDisplaying(policies); 392 (*handler)->PrepareForDisplaying(policies);
396 } 393 }
397 394
398 } // namespace policy 395 } // namespace policy
OLDNEW
« no previous file with comments | « chrome/app/policy/policy_templates.json ('k') | chrome/browser/profiles/profile.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698