OLD | NEW |
---|---|
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 <limits> | 7 #include <limits> |
8 | 8 |
9 #include "base/prefs/pref_value_map.h" | 9 #include "base/prefs/pref_value_map.h" |
10 #include "base/stl_util.h" | 10 #include "base/stl_util.h" |
(...skipping 337 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
348 Value::TYPE_DICTIONARY }, | 348 Value::TYPE_DICTIONARY }, |
349 // TODO(ibraaaa): Remove this when we finish moving | 349 // TODO(ibraaaa): Remove this when we finish moving |
350 // managed user settings out of the policy code. | 350 // managed user settings out of the policy code. |
351 // http://crbug.com/280674 | 351 // http://crbug.com/280674 |
352 { key::kUserDisplayName, | 352 { key::kUserDisplayName, |
353 prefs::kProfileName, | 353 prefs::kProfileName, |
354 Value::TYPE_STRING }, | 354 Value::TYPE_STRING }, |
355 { key::kSupervisedUserCreationEnabled, | 355 { key::kSupervisedUserCreationEnabled, |
356 prefs::kManagedUserCreationAllowed, | 356 prefs::kManagedUserCreationAllowed, |
357 Value::TYPE_BOOLEAN }, | 357 Value::TYPE_BOOLEAN }, |
358 { key::kDataCompressionProxyEnabled, | |
359 prefs::kSpdyProxyAuthEnabled, | |
360 Value::TYPE_BOOLEAN }, | |
Joao da Silva
2013/09/05 09:49:20
Put this at the end of this list (before line 445)
bolian
2013/09/05 17:36:52
Done.
| |
358 | 361 |
359 #if !defined(OS_MACOSX) | 362 #if !defined(OS_MACOSX) |
360 { key::kFullscreenAllowed, | 363 { key::kFullscreenAllowed, |
361 prefs::kFullscreenAllowed, | 364 prefs::kFullscreenAllowed, |
362 Value::TYPE_BOOLEAN }, | 365 Value::TYPE_BOOLEAN }, |
363 { key::kFullscreenAllowed, | 366 { key::kFullscreenAllowed, |
364 apps::prefs::kAppFullscreenAllowed, | 367 apps::prefs::kAppFullscreenAllowed, |
365 Value::TYPE_BOOLEAN }, | 368 Value::TYPE_BOOLEAN }, |
366 #endif // !defined(OS_MACOSX) | 369 #endif // !defined(OS_MACOSX) |
367 | 370 |
(...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
632 } | 635 } |
633 | 636 |
634 void ConfigurationPolicyHandlerList::PrepareForDisplaying( | 637 void ConfigurationPolicyHandlerList::PrepareForDisplaying( |
635 PolicyMap* policies) const { | 638 PolicyMap* policies) const { |
636 std::vector<ConfigurationPolicyHandler*>::const_iterator handler; | 639 std::vector<ConfigurationPolicyHandler*>::const_iterator handler; |
637 for (handler = handlers_.begin(); handler != handlers_.end(); ++handler) | 640 for (handler = handlers_.begin(); handler != handlers_.end(); ++handler) |
638 (*handler)->PrepareForDisplaying(policies); | 641 (*handler)->PrepareForDisplaying(policies); |
639 } | 642 } |
640 | 643 |
641 } // namespace policy | 644 } // namespace policy |
OLD | NEW |