Chromium Code Reviews| 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..d0ec718870c65dad7ffcb78379ab9a7026dda3d3 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, |
| @@ -574,6 +577,8 @@ class HostProcess |
| host_->SetMaximumSessionDuration(base::TimeDelta::FromHours(20)); |
| #endif |
| + host_->AddStatusObserver(new ResizingHostObserver(desktop_resizer_.get())); |
|
Wez
2012/09/20 21:35:15
You also need to remove the observer at some point
Jamie
2012/09/20 22:59:59
I don't think it ever needs to be removed, but thi
Wez
2012/09/21 00:59:32
If it isn't removed then the ChromotingHost may ou
Jamie
2012/09/24 22:49:15
I'd forgotten that the host is reference-counted.
|
| + |
| heartbeat_sender_.reset(new HeartbeatSender( |
| this, host_id_, signal_strategy_.get(), &key_pair_)); |
| @@ -698,6 +703,7 @@ class HostProcess |
| bool shutting_down_; |
| scoped_ptr<DesktopEnvironmentFactory> desktop_environment_factory_; |
| + scoped_ptr<DesktopResizer> desktop_resizer_; |
| scoped_ptr<XmppSignalStrategy> signal_strategy_; |
| scoped_ptr<SignalingConnector> signaling_connector_; |
| scoped_ptr<HeartbeatSender> heartbeat_sender_; |