Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 715 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 726 | 726 |
| 727 void ApplyPolicySettings(const PolicyMap& policies, | 727 void ApplyPolicySettings(const PolicyMap& policies, |
| 728 PrefValueMap* prefs) override { | 728 PrefValueMap* prefs) override { |
| 729 const base::Value* value = policies.GetValue(policy_name()); | 729 const base::Value* value = policies.GetValue(policy_name()); |
| 730 bool deleting_history_allowed; | 730 bool deleting_history_allowed; |
| 731 if (value && value->GetAsBoolean(&deleting_history_allowed) && | 731 if (value && value->GetAsBoolean(&deleting_history_allowed) && |
| 732 !deleting_history_allowed) { | 732 !deleting_history_allowed) { |
| 733 prefs->SetBoolean( | 733 prefs->SetBoolean( |
| 734 browsing_data::prefs::kDeleteBrowsingHistory, false); | 734 browsing_data::prefs::kDeleteBrowsingHistory, false); |
| 735 prefs->SetBoolean( | 735 prefs->SetBoolean( |
| 736 browsing_data::prefs::kDeleteDownloadHistory, false); | 736 browsing_data::prefs::kDeleteBrowsingHistoryBasic, false); |
|
msramek
2017/02/08 10:55:56
Good catch!
dullweber
2017/02/08 23:03:18
thanks, I tried to find all usages of kDeleteBrows
| |
| 737 prefs->SetBoolean(browsing_data::prefs::kDeleteDownloadHistory, false); | |
| 737 } | 738 } |
| 738 } | 739 } |
| 739 }; | 740 }; |
| 740 | 741 |
| 741 #if BUILDFLAG(ENABLE_EXTENSIONS) | 742 #if BUILDFLAG(ENABLE_EXTENSIONS) |
| 742 void GetExtensionAllowedTypesMap( | 743 void GetExtensionAllowedTypesMap( |
| 743 std::vector<std::unique_ptr<StringMappingListPolicyHandler::MappingEntry>>* | 744 std::vector<std::unique_ptr<StringMappingListPolicyHandler::MappingEntry>>* |
| 744 result) { | 745 result) { |
| 745 // Mapping from extension type names to Manifest::Type. | 746 // Mapping from extension type names to Manifest::Type. |
| 746 for (size_t index = 0; | 747 for (size_t index = 0; |
| (...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1006 #endif // defined(OS_CHROMEOS) | 1007 #endif // defined(OS_CHROMEOS) |
| 1007 | 1008 |
| 1008 #if BUILDFLAG(ENABLE_PLUGINS) | 1009 #if BUILDFLAG(ENABLE_PLUGINS) |
| 1009 handlers->AddHandler(base::MakeUnique<PluginPolicyHandler>()); | 1010 handlers->AddHandler(base::MakeUnique<PluginPolicyHandler>()); |
| 1010 #endif // BUILDFLAG(ENABLE_PLUGINS) | 1011 #endif // BUILDFLAG(ENABLE_PLUGINS) |
| 1011 | 1012 |
| 1012 return handlers; | 1013 return handlers; |
| 1013 } | 1014 } |
| 1014 | 1015 |
| 1015 } // namespace policy | 1016 } // namespace policy |
| OLD | NEW |