Move creation of capturer, input stub into ChromotingHost

chrome/service/service_process.cc

 // Copyright (c) 2010 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 "chrome/service/service_process.h"
 
 #include <algorithm>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
@@ skipping 10 matching lines @@
 #include "chrome/common/service_process_util.h"
 #include "chrome/service/cloud_print/cloud_print_proxy.h"
 #include "chrome/service/service_ipc_server.h"
 #include "net/base/network_change_notifier.h"
 
 #if defined(ENABLE_REMOTING)
 #include "remoting/base/constants.h"
 #include "remoting/host/chromoting_host.h"
 #include "remoting/host/chromoting_host_context.h"
 #include "remoting/host/json_host_config.h"
-
-#if defined(OS_WIN)
-#include "remoting/host/capturer_gdi.h"
-#include "remoting/host/event_executor_win.h"
-#elif defined(OS_LINUX)
-#include "remoting/host/capturer_linux.h"
-#include "remoting/host/event_executor_linux.h"
-#elif defined(OS_MACOSX)
-#include "remoting/host/capturer_mac.h"
-#include "remoting/host/event_executor_mac.h"
-#endif
 #endif  // defined(ENABLED_REMOTING)
 
 ServiceProcess* g_service_process = NULL;
 
 namespace {
 
 // Delay in millseconds after the last service is disabled before we attempt
 // a shutdown.
 const int64 kShutdownDelay = 60000;
 
@@ skipping 224 matching lines @@
   if (chromoting_context_.get())
     return true;
 
   // Load chromoting config from the disk.
   LoadChromotingConfig();
 
   // Start the chromoting context first.
   chromoting_context_.reset(new remoting::ChromotingHostContext());
   chromoting_context_->Start();
 
-  // Create capturer and executor. The ownership will be transfered
-  // to the chromoting host.
-  scoped_ptr<remoting::Capturer> capturer;
-  scoped_ptr<remoting::protocol::InputStub> input_stub;
-
-#if defined(OS_WIN)
-  capturer.reset(new remoting::CapturerGdi(
-      chromoting_context_->capture_message_loop()));
-  input_stub.reset(new remoting::EventExecutorWin(
-      chromoting_context_->capture_message_loop(), capturer.get()));
-#elif defined(OS_LINUX)
-  capturer.reset(new remoting::CapturerLinux(
-      chromoting_context_->capture_message_loop()));
-  input_stub.reset(new remoting::EventExecutorLinux(
-      chromoting_context_->capture_message_loop(), capturer.get()));
-#elif defined(OS_MACOSX)
-  capturer.reset(new remoting::CapturerMac(
-      chromoting_context_->capture_message_loop()));
-  input_stub.reset(new remoting::EventExecutorMac(
-      chromoting_context_->capture_message_loop(), capturer.get()));
-#endif
-
   // Create a chromoting host object.
   chromoting_host_ = new remoting::ChromotingHost(chromoting_context_.get(),
-                                                  chromoting_config_,
-                                                  capturer.release(),
-                                                  input_stub.release());
+                                                  chromoting_config_);
 
   // Then start the chromoting host.
   // When ChromotingHost is shutdown because of failure or a request that
   // we made OnChromotingShutdown() is calls.
   chromoting_host_->Start(
       NewRunnableMethod(this, &ServiceProcess::OnChromotingHostShutdown));
   OnServiceEnabled();
   return true;
 }
 
@@ skipping 100 matching lines @@
 #endif
 
 ServiceProcess::~ServiceProcess() {
   Teardown();
   g_service_process = NULL;
 }
 
 // Disable refcounting for runnable method because it is really not needed
 // when we post tasks on the main message loop.
 DISABLE_RUNNABLE_METHOD_REFCOUNT(ServiceProcess);