Chromium Code Reviews| Index: components/policy/core/common/policy_loader_win.cc |
| diff --git a/components/policy/core/common/policy_loader_win.cc b/components/policy/core/common/policy_loader_win.cc |
| index affe11149fbbabb806d807f6840bf101feaad505..55d18eeec091d05e1373cdc092b6aced417cece3 100644 |
| --- a/components/policy/core/common/policy_loader_win.cc |
| +++ b/components/policy/core/common/policy_loader_win.cc |
| @@ -479,6 +479,7 @@ bool PolicyLoaderWin::LoadGPOPolicy(PolicyScope scope, |
| // Merge with existing forced policy, giving precedence to the existing |
| // forced policy. |
| + // TODO(ljusten): Same problem as below. |
| new_forced_policy.Merge(forced_policy); |
| forced_policy.Swap(&new_forced_policy); |
| } else { |
| @@ -488,6 +489,11 @@ bool PolicyLoaderWin::LoadGPOPolicy(PolicyScope scope, |
| } |
| // Merge, give precedence to forced policy. |
| + // TODO(ljusten): This doesn't work properly if policies are explicitly |
| + // disabled or string list policies have less entries in the forced_policy. |
| + // The merged dictionary still has excessive policies and strings. To fix |
| + // this, use only one dict and call ReadPRegFile in the proper order (forced |
| + // last). |
|
pastarmovj
2016/10/27 11:47:38
nit: Please extract this as a bug too and referenc
|
| parsed_policy.Merge(forced_policy); |
| policy->Swap(&parsed_policy); |