Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1586)

Unified Diff: remoting/host/chromoting_host.cc

Issue 5065001: Move creation of capturer, input stub into ChromotingHost (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 10 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: remoting/host/chromoting_host.cc
diff --git a/remoting/host/chromoting_host.cc b/remoting/host/chromoting_host.cc
index c7fc7f5fcfd114183a50963042c25381c9ad5440..a385a0aa35db22780493d8c1e917368e777227d8 100644
--- a/remoting/host/chromoting_host.cc
+++ b/remoting/host/chromoting_host.cc
@@ -8,12 +8,21 @@
#include "base/task.h"
#include "build/build_config.h"
#include "remoting/base/constants.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
#include "remoting/base/encoder.h"
#include "remoting/base/encoder_verbatim.h"
#include "remoting/base/encoder_vp8.h"
#include "remoting/base/encoder_zlib.h"
#include "remoting/host/chromoting_host_context.h"
-#include "remoting/host/capturer.h"
#include "remoting/host/host_config.h"
#include "remoting/host/host_stub_fake.h"
#include "remoting/host/session_manager.h"
@@ -28,13 +37,25 @@ using remoting::protocol::ConnectionToClient;
namespace remoting {
ChromotingHost::ChromotingHost(ChromotingHostContext* context,
- MutableHostConfig* config,
- Capturer* capturer,
- protocol::InputStub* input_stub)
+ MutableHostConfig* config)
: context_(context),
config_(config),
- capturer_(capturer),
- input_stub_(input_stub),
+#if defined(OS_WIN)
+ capturer_(new remoting::CapturerGdi(
+ context->capture_message_loop())),
+ input_stub_(new remoting::EventExecutorWin(
+ context->capture_message_loop(), capturer_.get())),
+#elif defined(OS_LINUX)
+ capturer_(new remoting::CapturerLinux(
+ context->capture_message_loop())),
+ input_stub_(new remoting::EventExecutorLinux(
+ context->capture_message_loop(), capturer_.get())),
+#elif defined(OS_MACOSX)
+ capturer_(new remoting::CapturerMac(
+ context->capture_message_loop())),
+ input_stub_(new remoting::EventExecutorMac(
+ context->capture_message_loop(), capturer_.get())),
+#endif
host_stub_(new HostStubFake()),
state_(kInitial) {
}

Powered by Google App Engine
This is Rietveld 408576698