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

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

Issue 818433003: ChromeOS: Implement CaptivePortalAuthenticationIgnoresProxy policy. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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 "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/memory/scoped_vector.h" 9 #include "base/memory/scoped_vector.h"
10 #include "base/values.h" 10 #include "base/values.h"
(...skipping 496 matching lines...) Expand 10 before | Expand all | Expand 10 after
507 { key::kNativeMessagingUserLevelHosts, 507 { key::kNativeMessagingUserLevelHosts,
508 extensions::pref_names::kNativeMessagingUserLevelHosts, 508 extensions::pref_names::kNativeMessagingUserLevelHosts,
509 base::Value::TYPE_BOOLEAN }, 509 base::Value::TYPE_BOOLEAN },
510 { key::kBrowserGuestModeEnabled, 510 { key::kBrowserGuestModeEnabled,
511 prefs::kBrowserGuestModeEnabled, 511 prefs::kBrowserGuestModeEnabled,
512 base::Value::TYPE_BOOLEAN }, 512 base::Value::TYPE_BOOLEAN },
513 { key::kBrowserAddPersonEnabled, 513 { key::kBrowserAddPersonEnabled,
514 prefs::kBrowserAddPersonEnabled, 514 prefs::kBrowserAddPersonEnabled,
515 base::Value::TYPE_BOOLEAN }, 515 base::Value::TYPE_BOOLEAN },
516 #endif // !defined(OS_CHROMEOS) && !defined(OS_ANDROID) && !defined(OS_IOS) 516 #endif // !defined(OS_CHROMEOS) && !defined(OS_ANDROID) && !defined(OS_IOS)
517
518 #if defined(OS_CHROMEOS)
bartfab (slow) 2014/12/19 12:08:54 There is a block for Chrome OS-specific policies a
Alexander Alekseev 2014/12/22 22:20:11 Done.
519 { key::kCaptivePortalAuthenticationIgnoresProxy,
520 prefs::kCaptivePortalAuthenticationIgnoresProxy,
521 base::Value::TYPE_INTEGER },
bartfab (slow) 2014/12/19 12:08:54 Since this is actually an int-enum, you should use
Alexander Alekseev 2014/12/22 22:20:11 I've added IntRangePolicyHandler for the new prefe
522 #endif // defined(OS_CHROMEOS)
517 }; 523 };
518 524
519 #if defined(ENABLE_EXTENSIONS) 525 #if defined(ENABLE_EXTENSIONS)
520 void GetExtensionAllowedTypesMap( 526 void GetExtensionAllowedTypesMap(
521 ScopedVector<StringMappingListPolicyHandler::MappingEntry>* result) { 527 ScopedVector<StringMappingListPolicyHandler::MappingEntry>* result) {
522 // Mapping from extension type names to Manifest::Type. 528 // Mapping from extension type names to Manifest::Type.
523 for (size_t index = 0; 529 for (size_t index = 0;
524 index < extensions::schema_constants::kAllowedTypesMapSize; 530 index < extensions::schema_constants::kAllowedTypesMapSize;
525 ++index) { 531 ++index) {
526 const extensions::schema_constants::AllowedTypesMapEntry& entry = 532 const extensions::schema_constants::AllowedTypesMapEntry& entry =
(...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after
818 chrome_schema, 824 chrome_schema,
819 SCHEMA_STRICT, 825 SCHEMA_STRICT,
820 SimpleSchemaValidatingPolicyHandler::RECOMMENDED_ALLOWED, 826 SimpleSchemaValidatingPolicyHandler::RECOMMENDED_ALLOWED,
821 SimpleSchemaValidatingPolicyHandler::MANDATORY_PROHIBITED))); 827 SimpleSchemaValidatingPolicyHandler::MANDATORY_PROHIBITED)));
822 #endif // defined(OS_CHROMEOS) 828 #endif // defined(OS_CHROMEOS)
823 829
824 return handlers.Pass(); 830 return handlers.Pass();
825 } 831 }
826 832
827 } // namespace policy 833 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698