diff options
| author | pastarmovj@chromium.org <pastarmovj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-25 10:53:50 +0000 |
|---|---|---|
| committer | pastarmovj@chromium.org <pastarmovj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-25 10:53:50 +0000 |
| commit | 5b3355e40e1b9a8b7a1e7ba609c44b41aaf8e416 (patch) | |
| tree | f393d20e6ff20b0f719649e509d619176ddf8923 | |
| parent | 2f8dbed4fced70b1cb6cd8fee71510a36fe6ec5a (diff) | |
| download | chromium_src-5b3355e40e1b9a8b7a1e7ba609c44b41aaf8e416.zip chromium_src-5b3355e40e1b9a8b7a1e7ba609c44b41aaf8e416.tar.gz chromium_src-5b3355e40e1b9a8b7a1e7ba609c44b41aaf8e416.tar.bz2 | |
Merge 79273 - Always set refresh timestamp when installing cloud policy.
BUG=77232
TEST=manual
Review URL: http://codereview.chromium.org/6730026
TBR=mnissler@chromium.org
Review URL: http://codereview.chromium.org/6744003
git-svn-id: svn://svn.chromium.org/chrome/branches/696/src@79386 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/policy/cloud_policy_cache.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/policy/cloud_policy_cache.cc b/chrome/browser/policy/cloud_policy_cache.cc index 7b8a0fa..0eda36b 100644 --- a/chrome/browser/policy/cloud_policy_cache.cc +++ b/chrome/browser/policy/cloud_policy_cache.cc @@ -10,11 +10,11 @@ #include "base/logging.h" #include "base/task.h" #include "base/values.h" -#include "content/browser/browser_thread.h" #include "chrome/browser/policy/configuration_policy_pref_store.h" #include "chrome/browser/policy/proto/cloud_policy.pb.h" #include "chrome/browser/policy/proto/device_management_constants.h" #include "chrome/browser/policy/proto/device_management_local.pb.h" +#include "content/browser/browser_thread.h" using google::protobuf::RepeatedField; using google::protobuf::RepeatedPtrField; @@ -215,6 +215,7 @@ void CloudPolicyCache::SetPolicy(const em::PolicyFetchResponse& policy) { DCHECK(CalledOnValidThread()); bool initialization_was_not_complete = !initialization_complete_; is_unmanaged_ = false; + last_policy_refresh_time_ = base::Time::NowFromSystemTime(); base::Time timestamp; PolicyMap mandatory_policy; PolicyMap recommended_policy; @@ -229,7 +230,6 @@ void CloudPolicyCache::SetPolicy(const em::PolicyFetchResponse& policy) { mandatory_policy_.Swap(&mandatory_policy); recommended_policy_.Swap(&recommended_policy); initialization_complete_ = true; - last_policy_refresh_time_ = timestamp; has_device_policy_ = false; if (new_policy_differs || initialization_was_not_complete) { |