OLD | NEW |
---|---|
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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_provider.h" | 5 #include "chrome/browser/policy/configuration_policy_provider.h" |
6 | 6 |
7 #include "base/values.h" | 7 #include "base/values.h" |
8 #include "chrome/browser/policy/policy_map.h" | 8 #include "chrome/browser/policy/policy_map.h" |
9 | 9 |
10 namespace policy { | 10 namespace policy { |
(...skipping 11 matching lines...) Expand all Loading... | |
22 return true; | 22 return true; |
23 } | 23 } |
24 | 24 |
25 void ConfigurationPolicyProvider::ApplyPolicyValueTree( | 25 void ConfigurationPolicyProvider::ApplyPolicyValueTree( |
26 const DictionaryValue* policies, | 26 const DictionaryValue* policies, |
27 PolicyMap* result) { | 27 PolicyMap* result) { |
28 const PolicyDefinitionList* policy_list(policy_definition_list()); | 28 const PolicyDefinitionList* policy_list(policy_definition_list()); |
29 for (const PolicyDefinitionList::Entry* i = policy_list->begin; | 29 for (const PolicyDefinitionList::Entry* i = policy_list->begin; |
30 i != policy_list->end; ++i) { | 30 i != policy_list->end; ++i) { |
31 Value* value; | 31 Value* value; |
32 if (policies->Get(i->name, &value) && value->IsType(i->value_type)) | 32 if (policies->Get(i->name, &value) && !value->IsType(Value::TYPE_NULL)) |
Mattias Nissler (ping if slow)
2011/09/20 13:12:25
just remove the type check entirely.
simo
2011/09/22 11:43:26
Done.
| |
33 result->Set(i->policy_type, value->DeepCopy()); | 33 result->Set(i->policy_type, value->DeepCopy()); |
34 } | 34 } |
35 | 35 |
36 // TODO(mnissler): Handle preference overrides once |ConfigurationPolicyStore| | 36 // TODO(mnissler): Handle preference overrides once |ConfigurationPolicyStore| |
37 // supports it. | 37 // supports it. |
38 } | 38 } |
39 | 39 |
40 // Class ConfigurationPolicyObserverRegistrar. | 40 // Class ConfigurationPolicyObserverRegistrar. |
41 | 41 |
42 ConfigurationPolicyObserverRegistrar::ConfigurationPolicyObserverRegistrar() | 42 ConfigurationPolicyObserverRegistrar::ConfigurationPolicyObserverRegistrar() |
(...skipping 17 matching lines...) Expand all Loading... | |
60 observer_->OnUpdatePolicy(); | 60 observer_->OnUpdatePolicy(); |
61 } | 61 } |
62 | 62 |
63 void ConfigurationPolicyObserverRegistrar::OnProviderGoingAway() { | 63 void ConfigurationPolicyObserverRegistrar::OnProviderGoingAway() { |
64 observer_->OnProviderGoingAway(); | 64 observer_->OnProviderGoingAway(); |
65 provider_->RemoveObserver(this); | 65 provider_->RemoveObserver(this); |
66 provider_ = NULL; | 66 provider_ = NULL; |
67 } | 67 } |
68 | 68 |
69 } // namespace policy | 69 } // namespace policy |
OLD | NEW |