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

Unified Diff: remoting/host/it2me/it2me_host.cc

Issue 2847853003: Remove policy watching from It2MeHost. (Closed)
Patch Set: Fix unit tests Created 3 years, 8 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
Index: remoting/host/it2me/it2me_host.cc
diff --git a/remoting/host/it2me/it2me_host.cc b/remoting/host/it2me/it2me_host.cc
index 84bc3e3dba93d66770cf102bc15cfb3e9d967a75..39711581c421ed0cf2a07b20105dd7d38b6e54ad 100644
--- a/remoting/host/it2me/it2me_host.cc
+++ b/remoting/host/it2me/it2me_host.cc
@@ -28,7 +28,6 @@
#include "remoting/host/host_status_logger.h"
#include "remoting/host/it2me/it2me_confirmation_dialog.h"
#include "remoting/host/it2me_desktop_environment.h"
-#include "remoting/host/policy_watcher.h"
#include "remoting/host/register_support_host_request.h"
#include "remoting/protocol/auth_util.h"
#include "remoting/protocol/chromium_port_allocator_factory.h"
@@ -58,7 +57,6 @@ typedef ValidatingAuthenticator::ResultCallback ValidationResultCallback;
It2MeHost::It2MeHost(
std::unique_ptr<ChromotingHostContext> host_context,
- std::unique_ptr<PolicyWatcher> policy_watcher,
std::unique_ptr<It2MeConfirmationDialogFactory> dialog_factory,
base::WeakPtr<It2MeHost::Observer> observer,
std::unique_ptr<SignalStrategy> signal_strategy,
@@ -69,7 +67,6 @@ It2MeHost::It2MeHost(
signal_strategy_(std::move(signal_strategy)),
username_(username),
directory_bot_jid_(directory_bot_jid),
- policy_watcher_(std::move(policy_watcher)),
confirmation_dialog_factory_(std::move(dialog_factory)) {
DCHECK(host_context_->ui_task_runner()->BelongsToCurrentThread());
}
@@ -77,7 +74,6 @@ It2MeHost::It2MeHost(
It2MeHost::~It2MeHost() {
// Check that resources that need to be torn down on the UI thread are gone.
DCHECK(!desktop_environment_factory_.get());
- DCHECK(!policy_watcher_.get());
}
void It2MeHost::Connect() {
@@ -92,11 +88,6 @@ void It2MeHost::Connect() {
host_context_->video_capture_task_runner(),
host_context_->input_task_runner(), host_context_->ui_task_runner()));
- // Start monitoring configured policies.
- policy_watcher_->StartWatching(
- base::Bind(&It2MeHost::OnPolicyUpdate, this),
- base::Bind(&It2MeHost::OnPolicyError, this));
-
// Switch to the network thread to start the actual connection.
host_context_->network_task_runner()->PostTask(
FROM_HERE, base::Bind(&It2MeHost::ReadPolicyAndConnect, this));
@@ -132,8 +123,6 @@ void It2MeHost::DisconnectOnNetworkThread() {
// Post tasks to delete UI objects on the UI thread.
host_context_->ui_task_runner()->DeleteSoon(
FROM_HERE, desktop_environment_factory_.release());
- host_context_->ui_task_runner()->DeleteSoon(FROM_HERE,
- policy_watcher_.release());
SetState(kDisconnected, "");
}
@@ -348,11 +337,6 @@ void It2MeHost::OnPolicyUpdate(
}
}
-void It2MeHost::OnPolicyError() {
- // TODO(lukasza): Report the policy error to the user. crbug.com/433009
- NOTIMPLEMENTED();
-}
-
void It2MeHost::UpdateNatPolicy(bool nat_traversal_enabled) {
DCHECK(host_context_->network_task_runner()->BelongsToCurrentThread());
@@ -594,13 +578,9 @@ scoped_refptr<It2MeHost> It2MeHostFactory::CreateIt2MeHost(
const std::string& username,
const std::string& directory_bot_jid) {
DCHECK(context->ui_task_runner()->BelongsToCurrentThread());
-
- std::unique_ptr<PolicyWatcher> policy_watcher =
- PolicyWatcher::Create(policy_service, context->file_task_runner());
- return new It2MeHost(std::move(context), std::move(policy_watcher),
- base::MakeUnique<It2MeConfirmationDialogFactory>(),
- observer, std::move(signal_strategy), username,
- directory_bot_jid);
+ return new It2MeHost(
+ std::move(context), base::MakeUnique<It2MeConfirmationDialogFactory>(),
+ observer, std::move(signal_strategy), username, directory_bot_jid);
}
} // namespace remoting

Powered by Google App Engine
This is Rietveld 408576698