summaryrefslogtreecommitdiffstats
path: root/remoting/host/simple_host_process.cc
diff options
context:
space:
mode:
authorhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-17 05:17:35 +0000
committerhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-17 05:17:35 +0000
commita7b869bdf6b2c71b30599bbd72f3e1ebdee98fee (patch)
tree13dd6f9c986da2e17f8e6053f97cf1a265819ce2 /remoting/host/simple_host_process.cc
parent1631f7c651fbc7f4460a852126f545afc5513531 (diff)
downloadchromium_src-a7b869bdf6b2c71b30599bbd72f3e1ebdee98fee.zip
chromium_src-a7b869bdf6b2c71b30599bbd72f3e1ebdee98fee.tar.gz
chromium_src-a7b869bdf6b2c71b30599bbd72f3e1ebdee98fee.tar.bz2
Inject MessageLoop into Capturer
Simple patch to juse inject the message loop. BUG=None TEST=None Review URL: http://codereview.chromium.org/4971003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66387 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host/simple_host_process.cc')
-rw-r--r--remoting/host/simple_host_process.cc11
1 files changed, 7 insertions, 4 deletions
diff --git a/remoting/host/simple_host_process.cc b/remoting/host/simple_host_process.cc
index 0d4b80e..0a6ff42 100644
--- a/remoting/host/simple_host_process.cc
+++ b/remoting/host/simple_host_process.cc
@@ -80,15 +80,18 @@ int main(int argc, char** argv) {
scoped_ptr<remoting::Capturer> capturer;
scoped_ptr<remoting::protocol::InputStub> input_stub;
#if defined(OS_WIN)
- capturer.reset(new remoting::CapturerGdi());
+ capturer.reset(new remoting::CapturerGdi(
+ context.capture_message_loop()));
input_stub.reset(new remoting::EventExecutorWin(
context.capture_message_loop(), capturer.get()));
#elif defined(OS_LINUX)
- capturer.reset(new remoting::CapturerLinux());
+ capturer.reset(new remoting::CapturerLinux(
+ context.capture_message_loop()));
input_stub.reset(new remoting::EventExecutorLinux(
context.capture_message_loop(), capturer.get()));
#elif defined(OS_MACOSX)
- capturer.reset(new remoting::CapturerMac());
+ capturer.reset(new remoting::CapturerMac(
+ context.capture_message_loop()));
input_stub.reset(new remoting::EventExecutorMac(
context.capture_message_loop(), capturer.get()));
#endif
@@ -111,7 +114,7 @@ int main(int argc, char** argv) {
if (fake) {
// Inject a fake capturer.
LOG(INFO) << "Using a fake capturer.";
- capturer.reset(new remoting::CapturerFake());
+ capturer.reset(new remoting::CapturerFake(context.capture_message_loop()));
}
base::Thread file_io_thread("FileIO");