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/chromeos/policy/device_local_account_policy_provider.h" | 5 #include "chrome/browser/chromeos/policy/device_local_account_policy_provider.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "chrome/browser/chromeos/policy/device_local_account_external_data_mana
ger.h" | |
9 #include "chrome/browser/policy/cloud/cloud_policy_core.h" | 8 #include "chrome/browser/policy/cloud/cloud_policy_core.h" |
10 #include "chrome/browser/policy/cloud/cloud_policy_service.h" | 9 #include "chrome/browser/policy/cloud/cloud_policy_service.h" |
11 #include "chrome/browser/policy/policy_bundle.h" | 10 #include "chrome/browser/policy/policy_bundle.h" |
12 #include "components/policy/core/common/policy_namespace.h" | 11 #include "components/policy/core/common/policy_namespace.h" |
13 | 12 |
14 namespace policy { | 13 namespace policy { |
15 | 14 |
16 DeviceLocalAccountPolicyProvider::DeviceLocalAccountPolicyProvider( | 15 DeviceLocalAccountPolicyProvider::DeviceLocalAccountPolicyProvider( |
17 const std::string& user_id, | 16 const std::string& user_id, |
18 DeviceLocalAccountPolicyService* service) | 17 DeviceLocalAccountPolicyService* service) |
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
69 | 68 |
70 void DeviceLocalAccountPolicyProvider::UpdateFromBroker() { | 69 void DeviceLocalAccountPolicyProvider::UpdateFromBroker() { |
71 DeviceLocalAccountPolicyBroker* broker = GetBroker(); | 70 DeviceLocalAccountPolicyBroker* broker = GetBroker(); |
72 scoped_ptr<PolicyBundle> bundle(new PolicyBundle()); | 71 scoped_ptr<PolicyBundle> bundle(new PolicyBundle()); |
73 if (broker) { | 72 if (broker) { |
74 store_initialized_ |= broker->core()->store()->is_initialized(); | 73 store_initialized_ |= broker->core()->store()->is_initialized(); |
75 if (!waiting_for_policy_refresh_) { | 74 if (!waiting_for_policy_refresh_) { |
76 // Copy policy from the broker. | 75 // Copy policy from the broker. |
77 bundle->Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string())) | 76 bundle->Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string())) |
78 .CopyFrom(broker->core()->store()->policy_map()); | 77 .CopyFrom(broker->core()->store()->policy_map()); |
79 external_data_manager_ = broker->external_data_manager(); | |
80 } else { | 78 } else { |
81 // Wait for the refresh to finish. | 79 // Wait for the refresh to finish. |
82 return; | 80 return; |
83 } | 81 } |
84 } else { | 82 } else { |
85 // Keep existing policy, but do send an update. | 83 // Keep existing policy, but do send an update. |
86 waiting_for_policy_refresh_ = false; | 84 waiting_for_policy_refresh_ = false; |
87 weak_factory_.InvalidateWeakPtrs(); | 85 weak_factory_.InvalidateWeakPtrs(); |
88 bundle->CopyFrom(policies()); | 86 bundle->CopyFrom(policies()); |
89 } | 87 } |
90 UpdatePolicy(bundle.Pass()); | 88 UpdatePolicy(bundle.Pass()); |
91 } | 89 } |
92 | 90 |
93 } // namespace policy | 91 } // namespace policy |
OLD | NEW |