| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 // | 4 // |
| 5 // This is an application of a minimal host process in a Chromoting | 5 // This is an application of a minimal host process in a Chromoting |
| 6 // system. It serves the purpose of gluing different pieces together | 6 // system. It serves the purpose of gluing different pieces together |
| 7 // to make a functional host process for testing. | 7 // to make a functional host process for testing. |
| 8 // | 8 // |
| 9 // It peforms the following functionality: | 9 // It peforms the following functionality: |
| 10 // 1. Connect to the GTalk network and register the machine as a host. | 10 // 1. Connect to the GTalk network and register the machine as a host. |
| (...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 217 signal_strategy_.reset( | 217 signal_strategy_.reset( |
| 218 new XmppSignalStrategy(context_.jingle_thread(), xmpp_login_, | 218 new XmppSignalStrategy(context_.jingle_thread(), xmpp_login_, |
| 219 xmpp_auth_token_, xmpp_auth_service_)); | 219 xmpp_auth_token_, xmpp_auth_service_)); |
| 220 signaling_connector_.reset(new SignalingConnector( | 220 signaling_connector_.reset(new SignalingConnector( |
| 221 signal_strategy_.get(), | 221 signal_strategy_.get(), |
| 222 base::Bind(&SimpleHost::OnAuthFailed, base::Unretained(this)))); | 222 base::Bind(&SimpleHost::OnAuthFailed, base::Unretained(this)))); |
| 223 | 223 |
| 224 if (fake_) { | 224 if (fake_) { |
| 225 scoped_ptr<Capturer> capturer(new CapturerFake()); | 225 scoped_ptr<Capturer> capturer(new CapturerFake()); |
| 226 scoped_ptr<EventExecutor> event_executor = | 226 scoped_ptr<EventExecutor> event_executor = |
| 227 EventExecutor::Create( | 227 EventExecutor::Create(context_.desktop_message_loop(), |
| 228 context_.desktop_message_loop(), capturer.get()); | 228 context_.ui_message_loop(), |
| 229 capturer.get()); |
| 229 desktop_environment_ = DesktopEnvironment::CreateFake( | 230 desktop_environment_ = DesktopEnvironment::CreateFake( |
| 230 &context_, capturer.Pass(), event_executor.Pass()); | 231 &context_, capturer.Pass(), event_executor.Pass()); |
| 231 } else { | 232 } else { |
| 232 desktop_environment_ = DesktopEnvironment::Create(&context_); | 233 desktop_environment_ = DesktopEnvironment::Create(&context_); |
| 233 } | 234 } |
| 234 | 235 |
| 235 host_ = new ChromotingHost(&context_, signal_strategy_.get(), | 236 host_ = new ChromotingHost(&context_, signal_strategy_.get(), |
| 236 desktop_environment_.get(), network_settings_); | 237 desktop_environment_.get(), network_settings_); |
| 237 | 238 |
| 238 ServerLogEntry::Mode mode = | 239 ServerLogEntry::Mode mode = |
| (...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 410 max_port < 0 || max_port > 65535) { | 411 max_port < 0 || max_port > 65535) { |
| 411 LOG(ERROR) << "Invalid max-port value: " << max_port | 412 LOG(ERROR) << "Invalid max-port value: " << max_port |
| 412 << ". Expected integer in range [0, 65535]."; | 413 << ". Expected integer in range [0, 65535]."; |
| 413 return 1; | 414 return 1; |
| 414 } | 415 } |
| 415 simple_host.network_settings()->max_port = max_port; | 416 simple_host.network_settings()->max_port = max_port; |
| 416 } | 417 } |
| 417 | 418 |
| 418 return simple_host.Run(); | 419 return simple_host.Run(); |
| 419 } | 420 } |
| OLD | NEW |