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

Unified Diff: remoting/host/simple_host_process.cc

Issue 3265007: Add verbatim option to simple-host-process. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 10 years, 4 months 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/simple_host_process.cc
===================================================================
--- remoting/host/simple_host_process.cc (revision 57996)
+++ remoting/host/simple_host_process.cc (working copy)
@@ -26,6 +26,7 @@
#include "base/nss_util.h"
#include "base/scoped_nsautorelease_pool.h"
#include "base/thread.h"
+#include "remoting/base/encoder_verbatim.h"
#include "remoting/base/encoder_zlib.h"
#include "remoting/host/capturer_fake.h"
#include "remoting/host/chromoting_host.h"
@@ -59,6 +60,7 @@
const std::string kFakeSwitchName = "fake";
const std::string kConfigSwitchName = "config";
+const std::string kVerbatimSwitchName = "verbatim";
int main(int argc, char** argv) {
// Needed for the Mac, so we don't leak objects when threads are created.
@@ -73,21 +75,22 @@
scoped_ptr<remoting::Capturer> capturer;
scoped_ptr<remoting::Encoder> encoder;
- scoped_ptr<remoting::EventExecutor> executor;
+ scoped_ptr<remoting::EventExecutor> event_handler;
#if defined(OS_WIN)
capturer.reset(new remoting::CapturerGdi());
- executor.reset(new remoting::EventExecutorWin());
+ event_handler.reset(new remoting::EventExecutorWin(capturer.get()));
#elif defined(OS_LINUX)
capturer.reset(new remoting::CapturerLinux());
- executor.reset(new remoting::EventExecutorLinux());
+ event_handler.reset(new remoting::EventExecutorLinux(capturer.get()));
#elif defined(OS_MACOSX)
capturer.reset(new remoting::CapturerMac());
- executor.reset(new remoting::EventExecutorMac());
+ event_handler.reset(new remoting::EventExecutorMac(capturer.get()));
#endif
encoder.reset(new remoting::EncoderZlib());
// Check the argument to see if we should use a fake capturer and encoder.
bool fake = cmd_line->HasSwitch(kFakeSwitchName);
+ bool verbatim = cmd_line->HasSwitch(kVerbatimSwitchName);
#if defined(OS_WIN)
std::wstring path = GetEnvironmentVar(kHomeDrive);
@@ -107,6 +110,11 @@
capturer.reset(new remoting::CapturerFake());
}
+ if (verbatim) {
+ LOG(INFO) << "Using the verbatim encoder.";
+ encoder.reset(new remoting::EncoderVerbatim());
+ }
+
base::Thread file_io_thread("FileIO");
file_io_thread.Start();
@@ -129,7 +137,7 @@
config,
capturer.release(),
encoder.release(),
- executor.release());
+ event_handler.release());
// Let the chromoting host run until the shutdown task is executed.
MessageLoop message_loop(MessageLoop::TYPE_UI);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698