Cross-platform plumbing for resize-to-client

remoting/host/remoting_me2me_host.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // This file implements a standalone host process for Me2Me.
 
 #include <string>
 
 #include "base/at_exit.h"
 #include "base/bind.h"
@@ skipping 22 matching lines @@
 #include "remoting/base/breakpad.h"
 #include "remoting/base/constants.h"
 #include "remoting/host/branding.h"
 #include "remoting/host/chromoting_host.h"
 #include "remoting/host/chromoting_host_context.h"
 #include "remoting/host/chromoting_messages.h"
 #include "remoting/host/config_file_watcher.h"
 #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"
 #include "remoting/host/host_config.h"
 #include "remoting/host/host_event_logger.h"
 #include "remoting/host/host_user_interface.h"
 #include "remoting/host/json_host_config.h"
 #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"
 #include "remoting/host/video_frame_capturer.h"
 #include "remoting/jingle_glue/xmpp_signal_strategy.h"
 #include "remoting/protocol/me2me_host_authenticator_factory.h"
 
 #if defined(OS_POSIX)
 #include <signal.h>
 #include "remoting/host/posix/signal_handler.h"
@@ skipping 60 matching lines @@
         oauth_use_official_client_id_(false),
 #endif
         allow_nat_traversal_(true),
         restarting_(false),
         shutting_down_(false),
 #if defined(OS_WIN)
         desktop_environment_factory_(new SessionDesktopEnvironmentFactory()),
 #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,
                             base::Unretained(this)),
                  base::Bind(&HostProcess::OnDisconnectRequested,
                             base::Unretained(this)))
 #endif
   {
     network_change_notifier_.reset(net::NetworkChangeNotifier::Create());
   }
@@ skipping 424 matching lines @@
         context_.get(), signal_strategy_.get(),
         desktop_environment_factory_.get(),
         CreateHostSessionManager(network_settings,
                                  context_->url_request_context_getter()));
 
     // TODO(simonmorris): Get the maximum session duration from a policy.
 #if defined(OS_LINUX)
     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 this will leak memory as written.
I've fixed the leak.

[Wez, 2012/09/21 00:59:32]

If it isn't removed then the ChromotingHost may outlive it, and notify a dead
object, surely?

[Jamie, 2012/09/24 22:49:15]

I'd forgotten that the host is reference-counted. I've changed it to use do the
Add/RemoveStatusObserver in the ctor/dtor like our other observers.

+
     heartbeat_sender_.reset(new HeartbeatSender(
         this, host_id_, signal_strategy_.get(), &key_pair_));
 
     log_to_server_.reset(
         new LogToServer(host_, ServerLogEntry::ME2ME, signal_strategy_.get()));
     host_event_logger_ = HostEventLogger::Create(host_, kApplicationName);
 
 #if defined(OS_MACOSX) || defined(OS_WIN)
     if (host_user_interface_.get()) {
       host_user_interface_->Start(
@@ skipping 104 matching lines @@
   bool oauth_use_official_client_id_;
 
   scoped_ptr<policy_hack::PolicyWatcher> policy_watcher_;
   bool allow_nat_traversal_;
   std::string talkgadget_prefix_;
 
   bool restarting_;
   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_;
   scoped_ptr<LogToServer> log_to_server_;
   scoped_ptr<HostEventLogger> host_event_logger_;
 
 #if defined(OS_MACOSX) || defined(OS_WIN)
   scoped_ptr<HostUserInterface> host_user_interface_;
 #endif
 
@@ skipping 111 matching lines @@
             user32.GetFunctionPointer("SetProcessDPIAware"));
     set_process_dpi_aware();
   }
 
   // CommandLine::Init() ignores the passed |argc| and |argv| on Windows getting
   // the command line from GetCommandLineW(), so we can safely pass NULL here.
   return main(0, NULL);
 }
 
 #endif  // defined(OS_WIN)