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

Unified Diff: remoting/host/simple_host_process.cc

Issue 9617027: Chromoting: Implemented security attention sequence (SAS) emulation on Windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 9 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
Index: remoting/host/simple_host_process.cc
diff --git a/remoting/host/simple_host_process.cc b/remoting/host/simple_host_process.cc
index ad454ae189d48af0b35e7e20afded5de11e397c5..9adfe3a702c0bfab1426280f60291e282f622929 100644
--- a/remoting/host/simple_host_process.cc
+++ b/remoting/host/simple_host_process.cc
@@ -85,6 +85,9 @@ const char kVideoSwitchValueZip[] = "zip";
const char kVideoSwitchValueVp8[] = "vp8";
const char kVideoSwitchValueVp8Rtp[] = "vp8rtp";
+const int kDefaultMinPortNumber = 12400;
+const int kDefaultMaxPortNumber = 12409;
Wez 2012/03/07 01:56:13 nit: Not part of this CL?
alexeypa (please no reviews) 2012/03/07 19:59:08 Done.
+
} // namespace
namespace remoting {
@@ -94,7 +97,7 @@ class SimpleHost {
SimpleHost()
: message_loop_(MessageLoop::TYPE_UI),
file_io_thread_("FileIO"),
- context_(message_loop_.message_loop_proxy()),
+ context_(NULL, message_loop_.message_loop_proxy()),
fake_(false),
is_it2me_(false) {
context_.Start();
@@ -217,7 +220,8 @@ class SimpleHost {
if (fake_) {
Capturer* capturer = new CapturerFake();
EventExecutor* event_executor =
- EventExecutor::Create(context_.desktop_message_loop(), capturer);
+ EventExecutor::Create(context_.desktop_message_loop(), NULL,
+ capturer);
desktop_environment_.reset(
new DesktopEnvironment(&context_, capturer, event_executor));
} else {
@@ -360,6 +364,8 @@ int main(int argc, char** argv) {
return 1;
}
simple_host.network_settings()->min_port = min_port;
+ } else {
+ simple_host.network_settings()->min_port = kDefaultMinPortNumber;
}
if (cmd_line->HasSwitch(kMaxPortSwitchName)) {
@@ -373,6 +379,8 @@ int main(int argc, char** argv) {
return 1;
}
simple_host.network_settings()->max_port = max_port;
+ } else {
+ simple_host.network_settings()->max_port = kDefaultMaxPortNumber;
}
return simple_host.Run();

Powered by Google App Engine
This is Rietveld 408576698