Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(501)

Unified Diff: remoting/host/policy_watcher.cc

Issue 2867223003: Send a message to the client if bad It2Me policies are read. (Closed)
Patch Set: Fix race. Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/host/policy_watcher.h ('k') | remoting/host/policy_watcher_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/policy_watcher.cc
diff --git a/remoting/host/policy_watcher.cc b/remoting/host/policy_watcher.cc
index 4dc8beb587fc964a4e644a6ed4b6ecdef649743b..2b9a60a429cddd20a81b0f9b734f6fecbfc95854 100644
--- a/remoting/host/policy_watcher.cc
+++ b/remoting/host/policy_watcher.cc
@@ -159,11 +159,7 @@ void PolicyWatcher::StartWatching(
}
std::unique_ptr<base::DictionaryValue> PolicyWatcher::GetCurrentPolicies() {
- // If |old_policies_| is empty, then the PolicyService has not yet provided
- // policies, so just return the default values. Otherwise, |old_policies_|
- // already contains all the supported policies, defaults and overrides.
- return old_policies_->size() == 0 ? GetDefaultPolicies()
- : old_policies_->CreateDeepCopy();
+ return old_policies_->CreateDeepCopy();
}
std::unique_ptr<base::DictionaryValue> PolicyWatcher::GetDefaultPolicies() {
« no previous file with comments | « remoting/host/policy_watcher.h ('k') | remoting/host/policy_watcher_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698