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

Unified Diff: remoting/host/simple_host_process.cc

Issue 10873050: [Chromoting] Hook up host talkgadget policy checks. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Move callback Created 8 years, 4 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/simple_host_process.cc
diff --git a/remoting/host/simple_host_process.cc b/remoting/host/simple_host_process.cc
index 63dc305e5f1ad780e3efd66257703c62722c53e2..33741b0583fbf4c8c08f5c3d5707d74bb93d121d 100644
--- a/remoting/host/simple_host_process.cc
+++ b/remoting/host/simple_host_process.cc
@@ -38,6 +38,7 @@
#include "remoting/host/chromoting_host.h"
#include "remoting/host/constants.h"
#include "remoting/host/desktop_environment.h"
+#include "remoting/host/dns_blackhole_checker.h"
#include "remoting/host/event_executor.h"
#include "remoting/host/heartbeat_sender.h"
#include "remoting/host/host_key_pair.h"
@@ -220,8 +221,10 @@ class SimpleHost : public HeartbeatSender::Listener {
signal_strategy_.reset(new XmppSignalStrategy(
context_.url_request_context_getter(),
xmpp_login_, xmpp_auth_token_, xmpp_auth_service_));
+ dns_blackhole_checker_.reset(new DnsBlackholeChecker(
+ &context_, kDefaultHostTalkGadgetPrefix));
signaling_connector_.reset(new SignalingConnector(
- signal_strategy_.get(),
+ signal_strategy_.get(), &context_, dns_blackhole_checker_.get(),
base::Bind(&SimpleHost::OnAuthFailed, base::Unretained(this))));
if (fake_) {
@@ -304,6 +307,7 @@ class SimpleHost : public HeartbeatSender::Listener {
log_to_server_.reset();
heartbeat_sender_.reset();
signaling_connector_.reset();
+ dns_blackhole_checker_.reset();
signal_strategy_.reset();
message_loop_.PostTask(FROM_HERE, MessageLoop::QuitClosure());
@@ -327,6 +331,7 @@ class SimpleHost : public HeartbeatSender::Listener {
std::string xmpp_auth_service_;
scoped_ptr<XmppSignalStrategy> signal_strategy_;
+ scoped_ptr<DnsBlackholeChecker> dns_blackhole_checker_;
scoped_ptr<SignalingConnector> signaling_connector_;
scoped_ptr<DesktopEnvironment> desktop_environment_;
scoped_ptr<LogToServer> log_to_server_;

Powered by Google App Engine
This is Rietveld 408576698