Reworked the plumbing required to pass the client resolution to the desktop resizer.

remoting/host/daemon_process_win.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.
 
 #include "remoting/host/daemon_process.h"
 
 #include "base/base_switches.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/process.h"
 #include "base/single_thread_task_runner.h"
 #include "base/time.h"
 #include "base/timer.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/scoped_handle.h"
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_message_macros.h"
 #include "remoting/base/auto_thread_task_runner.h"
 #include "remoting/host/chromoting_messages.h"
 #include "remoting/host/desktop_session_win.h"
 #include "remoting/host/host_exit_codes.h"
 #include "remoting/host/host_main.h"
 #include "remoting/host/ipc_constants.h"
+#include "remoting/host/screen_resolution.h"
 #include "remoting/host/win/launch_process_with_token.h"
 #include "remoting/host/win/unprivileged_process_delegate.h"
 #include "remoting/host/win/worker_process_launcher.h"
 
 using base::win::ScopedHandle;
 using base::TimeDelta;
 
 namespace remoting {
 
 class WtsTerminalMonitor;
@@ skipping 20 matching lines @@
       base::ProcessHandle desktop_process,
       IPC::PlatformFileForTransit desktop_pipe) OVERRIDE;
 
  protected:
   // Stoppable implementation.
   virtual void DoStop() OVERRIDE;
 
   // DaemonProcess implementation.
   virtual scoped_ptr<DesktopSession> DoCreateDesktopSession(
       int terminal_id,
-      const DesktopSessionParams& params,
+      const ScreenResolution& resolution,
       bool virtual_terminal) OVERRIDE;
   virtual void DoCrashNetworkProcess(
       const tracked_objects::Location& location) OVERRIDE;
   virtual void LaunchNetworkProcess() OVERRIDE;
 
  private:
   scoped_ptr<WorkerProcessLauncher> network_launcher_;
 
   // Handle of the network process.
   ScopedHandle network_process_;
@@ skipping 60 matching lines @@
 
 void DaemonProcessWin::DoStop() {
   DCHECK(caller_task_runner()->BelongsToCurrentThread());
 
   network_launcher_.reset();
   DaemonProcess::DoStop();
 }
 
 scoped_ptr<DesktopSession> DaemonProcessWin::DoCreateDesktopSession(
     int terminal_id,
-    const DesktopSessionParams& params,
+    const ScreenResolution& resolution,
     bool virtual_terminal) {
   DCHECK(caller_task_runner()->BelongsToCurrentThread());
 
   if (virtual_terminal) {
     return DesktopSessionWin::CreateForVirtualTerminal(
-        caller_task_runner(), io_task_runner(), this, terminal_id, params);
+        caller_task_runner(), io_task_runner(), this, terminal_id, resolution);
   } else {
     return DesktopSessionWin::CreateForConsole(
-        caller_task_runner(), io_task_runner(), this, terminal_id, params);
+        caller_task_runner(), io_task_runner(), this, terminal_id, resolution);
   }
 }
 
 void DaemonProcessWin::DoCrashNetworkProcess(
     const tracked_objects::Location& location) {
   DCHECK(caller_task_runner()->BelongsToCurrentThread());
 
   network_launcher_->Crash(location);
 }
 
@@ skipping 26 matching lines @@
     scoped_refptr<AutoThreadTaskRunner> io_task_runner,
     const base::Closure& stopped_callback) {
   scoped_ptr<DaemonProcessWin> daemon_process(
       new DaemonProcessWin(caller_task_runner, io_task_runner,
                            stopped_callback));
   daemon_process->Initialize();
   return daemon_process.PassAs<DaemonProcess>();
 }
 
 }  // namespace remoting