| Index: remoting/host/simple_host_process.cc
|
| diff --git a/remoting/host/simple_host_process.cc b/remoting/host/simple_host_process.cc
|
| index 99af0712cf96d60d4fa5de56a2390a1722bfe01a..2572aeba09cf443af2adbc5541f71c798c8ee908 100644
|
| --- a/remoting/host/simple_host_process.cc
|
| +++ b/remoting/host/simple_host_process.cc
|
| @@ -35,13 +35,11 @@
|
| #include "remoting/host/capturer_fake.h"
|
| #include "remoting/host/chromoting_host.h"
|
| #include "remoting/host/chromoting_host_context.h"
|
| -#include "remoting/host/continue_window.h"
|
| #include "remoting/host/curtain.h"
|
| #include "remoting/host/desktop_environment.h"
|
| -#include "remoting/host/disconnect_window.h"
|
| #include "remoting/host/event_executor.h"
|
| #include "remoting/host/heartbeat_sender.h"
|
| -#include "remoting/host/local_input_monitor.h"
|
| +#include "remoting/host/it2me_observer.h"
|
| #include "remoting/host/log_to_server.h"
|
| #include "remoting/host/json_host_config.h"
|
| #include "remoting/host/register_support_host_request.h"
|
| @@ -63,6 +61,7 @@ using remoting::ChromotingHost;
|
| using remoting::DesktopEnvironment;
|
| using remoting::kChromotingTokenDefaultServiceName;
|
| using remoting::kXmppAuthServiceConfigPath;
|
| +using remoting::It2MeObserver;
|
| using remoting::protocol::CandidateSessionConfig;
|
| using remoting::protocol::ChannelConfig;
|
| using std::string;
|
| @@ -167,16 +166,8 @@ class SimpleHost {
|
| remoting::EventExecutor::Create(context.desktop_message_loop(),
|
| capturer);
|
| remoting::Curtain* curtain = remoting::Curtain::Create();
|
| - remoting::DisconnectWindow* disconnect_window =
|
| - remoting::DisconnectWindow::Create();
|
| - remoting::ContinueWindow* continue_window =
|
| - remoting::ContinueWindow::Create();
|
| - remoting::LocalInputMonitor* local_input_monitor =
|
| - remoting::LocalInputMonitor::Create();
|
| desktop_environment.reset(
|
| - new DesktopEnvironment(&context, capturer, event_executor, curtain,
|
| - disconnect_window, continue_window,
|
| - local_input_monitor));
|
| + new DesktopEnvironment(&context, capturer, event_executor, curtain));
|
| } else {
|
| desktop_environment.reset(DesktopEnvironment::Create(&context));
|
| }
|
| @@ -185,6 +176,13 @@ class SimpleHost {
|
| access_verifier.release(), false);
|
| host_->set_it2me(is_it2me_);
|
|
|
| + scoped_ptr<It2MeObserver> it2me_observer;
|
| + if (is_it2me_) {
|
| + it2me_observer.reset(new It2MeObserver(host_, &context));
|
| + it2me_observer->Init();
|
| + host_->AddStatusObserver(it2me_observer.get());
|
| + }
|
| +
|
| if (protocol_config_.get()) {
|
| host_->set_protocol_config(protocol_config_.release());
|
| }
|
|
|