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

Unified Diff: remoting/host/remoting_me2me_host.cc

Issue 746723002: Revert of Reporting of policy errors via host-offline-reason: part 1 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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_hack/policy_watcher_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/remoting_me2me_host.cc
diff --git a/remoting/host/remoting_me2me_host.cc b/remoting/host/remoting_me2me_host.cc
index d81c4ed7bbfe7e73bb43366f07757ae7323f73b7..a01122a26dc5a7d88c30be3bd39860bfb6620f2e 100644
--- a/remoting/host/remoting_me2me_host.cc
+++ b/remoting/host/remoting_me2me_host.cc
@@ -233,7 +233,6 @@
// Handles policy updates, by calling On*PolicyUpdate methods.
void OnPolicyUpdate(scoped_ptr<base::DictionaryValue> policies);
- void OnPolicyError();
void ApplyHostDomainPolicy();
void ApplyUsernamePolicy();
bool OnHostDomainPolicyUpdate(base::DictionaryValue* policies);
@@ -529,8 +528,7 @@
policy_watcher_ = policy_hack::PolicyWatcher::Create(
nullptr, context_->network_task_runner());
policy_watcher_->StartWatching(
- base::Bind(&HostProcess::OnPolicyUpdate, base::Unretained(this)),
- base::Bind(&HostProcess::OnPolicyError, base::Unretained(this)));
+ base::Bind(&HostProcess::OnPolicyUpdate, base::Unretained(this)));
} else {
// Reapply policies that could be affected by a new config.
ApplyHostDomainPolicy();
@@ -935,15 +933,6 @@
}
}
-void HostProcess::OnPolicyError() {
- context_->network_task_runner()->PostTask(
- FROM_HERE,
- base::Bind(
- &HostProcess::ShutdownHost,
- this,
- kInvalidHostConfigurationExitCode));
-}
-
void HostProcess::ApplyHostDomainPolicy() {
HOST_LOG << "Policy sets host domain: " << host_domain_;
« no previous file with comments | « remoting/host/policy_hack/policy_watcher_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698