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/basictypes.h" | 9 #include "base/basictypes.h" |
10 #include "base/prefs/pref_value_map.h" | 10 #include "base/prefs/pref_value_map.h" |
11 #include "base/stl_util.h" | 11 #include "base/stl_util.h" |
12 #include "base/values.h" | 12 #include "base/values.h" |
13 #include "chrome/browser/extensions/policy_handlers.h" | 13 #include "chrome/browser/extensions/policy_handlers.h" |
14 #include "chrome/browser/net/disk_cache_dir_policy_handler.h" | 14 #include "chrome/browser/net/disk_cache_dir_policy_handler.h" |
15 #include "chrome/browser/net/proxy_policy_handler.h" | 15 #include "chrome/browser/net/proxy_policy_handler.h" |
16 #include "chrome/browser/policy/autofill_policy_handler.h" | 16 #include "chrome/browser/policy/autofill_policy_handler.h" |
17 #include "chrome/browser/policy/configuration_policy_handler.h" | 17 #include "chrome/browser/policy/configuration_policy_handler.h" |
18 #include "chrome/browser/policy/file_selection_dialogs_policy_handler.h" | 18 #include "chrome/browser/policy/file_selection_dialogs_policy_handler.h" |
19 #include "chrome/browser/policy/javascript_policy_handler.h" | 19 #include "chrome/browser/policy/javascript_policy_handler.h" |
20 #include "chrome/browser/policy/policy_error_map.h" | 20 #include "chrome/browser/policy/policy_error_map.h" |
21 #include "chrome/browser/policy/policy_map.h" | 21 #include "chrome/browser/policy/policy_map.h" |
22 #include "chrome/browser/policy/url_blacklist_policy_handler.h" | 22 #include "chrome/browser/policy/url_blacklist_policy_handler.h" |
23 #include "chrome/browser/profiles/incognito_mode_policy_handler.h" | 23 #include "chrome/browser/profiles/incognito_mode_policy_handler.h" |
24 #include "chrome/browser/search_engines/default_search_policy_handler.h" | 24 #include "chrome/browser/search_engines/default_search_policy_handler.h" |
25 #include "chrome/browser/sessions/restore_on_startup_policy_handler.h" | 25 #include "chrome/browser/sessions/restore_on_startup_policy_handler.h" |
26 #include "chrome/browser/sync/sync_policy_handler.h" | 26 #include "chrome/browser/sync/sync_policy_handler.h" |
27 #include "chrome/common/pref_names.h" | 27 #include "chrome/common/pref_names.h" |
| 28 #include "components/policy/core/common/policy_details.h" |
28 #include "components/policy/core/common/policy_pref_names.h" | 29 #include "components/policy/core/common/policy_pref_names.h" |
29 #include "extensions/common/manifest.h" | 30 #include "extensions/common/manifest.h" |
30 #include "grit/generated_resources.h" | 31 #include "grit/generated_resources.h" |
31 #include "policy/policy_constants.h" | 32 #include "policy/policy_constants.h" |
32 | 33 |
33 #if defined(OS_CHROMEOS) | 34 #if defined(OS_CHROMEOS) |
34 #include "ash/magnifier/magnifier_constants.h" | 35 #include "ash/magnifier/magnifier_constants.h" |
35 #include "chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.h
" | 36 #include "chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.h
" |
36 #include "chromeos/dbus/power_policy_controller.h" | 37 #include "chromeos/dbus/power_policy_controller.h" |
37 #endif // defined(OS_CHROMEOS) | 38 #endif // defined(OS_CHROMEOS) |
(...skipping 446 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
484 | 485 |
485 std::vector<ConfigurationPolicyHandler*>::const_iterator handler; | 486 std::vector<ConfigurationPolicyHandler*>::const_iterator handler; |
486 for (handler = handlers_.begin(); handler != handlers_.end(); ++handler) { | 487 for (handler = handlers_.begin(); handler != handlers_.end(); ++handler) { |
487 if ((*handler)->CheckPolicySettings(policies, errors) && prefs) | 488 if ((*handler)->CheckPolicySettings(policies, errors) && prefs) |
488 (*handler)->ApplyPolicySettings(policies, prefs); | 489 (*handler)->ApplyPolicySettings(policies, prefs); |
489 } | 490 } |
490 | 491 |
491 for (PolicyMap::const_iterator it = policies.begin(); | 492 for (PolicyMap::const_iterator it = policies.begin(); |
492 it != policies.end(); | 493 it != policies.end(); |
493 ++it) { | 494 ++it) { |
494 if (IsDeprecatedPolicy(it->first)) | 495 const PolicyDetails* details = GetChromePolicyDetails(it->first); |
| 496 if (details && details->is_deprecated) |
495 errors->AddError(it->first, IDS_POLICY_DEPRECATED); | 497 errors->AddError(it->first, IDS_POLICY_DEPRECATED); |
496 } | 498 } |
497 } | 499 } |
498 | 500 |
499 void ConfigurationPolicyHandlerList::PrepareForDisplaying( | 501 void ConfigurationPolicyHandlerList::PrepareForDisplaying( |
500 PolicyMap* policies) const { | 502 PolicyMap* policies) const { |
501 std::vector<ConfigurationPolicyHandler*>::const_iterator handler; | 503 std::vector<ConfigurationPolicyHandler*>::const_iterator handler; |
502 for (handler = handlers_.begin(); handler != handlers_.end(); ++handler) | 504 for (handler = handlers_.begin(); handler != handlers_.end(); ++handler) |
503 (*handler)->PrepareForDisplaying(policies); | 505 (*handler)->PrepareForDisplaying(policies); |
504 } | 506 } |
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
690 | 692 |
691 #if defined(OS_ANDROID) | 693 #if defined(OS_ANDROID) |
692 handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>( | 694 handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>( |
693 new ManagedBookmarksPolicyHandler())); | 695 new ManagedBookmarksPolicyHandler())); |
694 #endif | 696 #endif |
695 return handlers.Pass(); | 697 return handlers.Pass(); |
696 } | 698 } |
697 #endif // !defined(OS_IOS) | 699 #endif // !defined(OS_IOS) |
698 | 700 |
699 } // namespace policy | 701 } // namespace policy |
OLD | NEW |