Index: remoting/host/remoting_me2me_host.cc |
diff --git a/remoting/host/remoting_me2me_host.cc b/remoting/host/remoting_me2me_host.cc |
index d1989db1520fac6b8425ac9667b1f4e04087b56c..50790e74d504982de4c9d5f6cd6e08cef99fb23e 100644 |
--- a/remoting/host/remoting_me2me_host.cc |
+++ b/remoting/host/remoting_me2me_host.cc |
@@ -40,6 +40,7 @@ |
#include "remoting/host/constants.h" |
#include "remoting/host/config_file_watcher.h" |
#include "remoting/host/desktop_environment_factory.h" |
+#include "remoting/host/desktop_resizer.h" |
#include "remoting/host/dns_blackhole_checker.h" |
#include "remoting/host/event_executor.h" |
#include "remoting/host/heartbeat_sender.h" |
@@ -50,6 +51,7 @@ |
#include "remoting/host/log_to_server.h" |
#include "remoting/host/network_settings.h" |
#include "remoting/host/policy_hack/policy_watcher.h" |
+#include "remoting/host/resizing_host_observer.h" |
#include "remoting/host/session_manager_factory.h" |
#include "remoting/host/signaling_connector.h" |
#include "remoting/host/usage_stats_consent.h" |
@@ -130,6 +132,7 @@ class HostProcess |
#else // !defined(OS_WIN) |
desktop_environment_factory_(new DesktopEnvironmentFactory()), |
#endif // !defined(OS_WIN) |
+ desktop_resizer_(DesktopResizer::Create()), |
exit_code_(kSuccessExitCode) |
#if defined(OS_MACOSX) |
, curtain_(base::Bind(&HostProcess::OnDisconnectRequested, |
@@ -581,6 +584,9 @@ class HostProcess |
new LogToServer(host_, ServerLogEntry::ME2ME, signal_strategy_.get())); |
host_event_logger_ = HostEventLogger::Create(host_, kApplicationName); |
+ resizing_host_observer_.reset( |
+ new ResizingHostObserver(desktop_resizer_.get(), host_)); |
+ |
#if defined(OS_MACOSX) || defined(OS_WIN) |
if (host_user_interface_.get()) { |
host_user_interface_->Start( |
@@ -668,6 +674,7 @@ class HostProcess |
heartbeat_sender_.reset(); |
signaling_connector_.reset(); |
signal_strategy_.reset(); |
+ resizing_host_observer_.reset(); |
} |
scoped_ptr<ChromotingHostContext> context_; |
@@ -698,6 +705,8 @@ class HostProcess |
bool shutting_down_; |
scoped_ptr<DesktopEnvironmentFactory> desktop_environment_factory_; |
+ scoped_ptr<DesktopResizer> desktop_resizer_; |
+ scoped_ptr<ResizingHostObserver> resizing_host_observer_; |
scoped_ptr<XmppSignalStrategy> signal_strategy_; |
scoped_ptr<SignalingConnector> signaling_connector_; |
scoped_ptr<HeartbeatSender> heartbeat_sender_; |