| 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 #include "remoting/host/plugin/host_script_object.h" | 5 #include "remoting/host/plugin/host_script_object.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/json/json_reader.h" | 8 #include "base/json/json_reader.h" |
| 9 #include "base/json/json_writer.h" | 9 #include "base/json/json_writer.h" |
| 10 #include "base/message_loop.h" | 10 #include "base/message_loop.h" |
| (...skipping 350 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 361 network_settings.min_port = NetworkSettings::kDefaultMinPort; | 361 network_settings.min_port = NetworkSettings::kDefaultMinPort; |
| 362 network_settings.max_port = NetworkSettings::kDefaultMaxPort; | 362 network_settings.max_port = NetworkSettings::kDefaultMaxPort; |
| 363 } | 363 } |
| 364 | 364 |
| 365 // Create the host. | 365 // Create the host. |
| 366 host_ = new ChromotingHost( | 366 host_ = new ChromotingHost( |
| 367 signal_strategy_.get(), | 367 signal_strategy_.get(), |
| 368 desktop_environment_factory_.get(), | 368 desktop_environment_factory_.get(), |
| 369 CreateHostSessionManager(network_settings, | 369 CreateHostSessionManager(network_settings, |
| 370 host_context_->url_request_context_getter()), | 370 host_context_->url_request_context_getter()), |
| 371 host_context_->audio_task_runner(), |
| 371 host_context_->capture_task_runner(), | 372 host_context_->capture_task_runner(), |
| 372 host_context_->encode_task_runner(), | 373 host_context_->encode_task_runner(), |
| 373 host_context_->network_task_runner()); | 374 host_context_->network_task_runner()); |
| 374 host_->AddStatusObserver(this); | 375 host_->AddStatusObserver(this); |
| 375 log_to_server_.reset( | 376 log_to_server_.reset( |
| 376 new LogToServer(host_, ServerLogEntry::IT2ME, signal_strategy_.get())); | 377 new LogToServer(host_, ServerLogEntry::IT2ME, signal_strategy_.get())); |
| 377 | 378 |
| 378 // Disable audio by default. | 379 // Disable audio by default. |
| 379 // TODO(sergeyu): Add UI to enable it. | 380 // TODO(sergeyu): Add UI to enable it. |
| 380 scoped_ptr<protocol::CandidateSessionConfig> protocol_config = | 381 scoped_ptr<protocol::CandidateSessionConfig> protocol_config = |
| (...skipping 1132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1513 } | 1514 } |
| 1514 | 1515 |
| 1515 void HostNPScriptObject::SetException(const std::string& exception_string) { | 1516 void HostNPScriptObject::SetException(const std::string& exception_string) { |
| 1516 DCHECK(plugin_task_runner_->BelongsToCurrentThread()); | 1517 DCHECK(plugin_task_runner_->BelongsToCurrentThread()); |
| 1517 | 1518 |
| 1518 g_npnetscape_funcs->setexception(parent_, exception_string.c_str()); | 1519 g_npnetscape_funcs->setexception(parent_, exception_string.c_str()); |
| 1519 LOG(INFO) << exception_string; | 1520 LOG(INFO) << exception_string; |
| 1520 } | 1521 } |
| 1521 | 1522 |
| 1522 } // namespace remoting | 1523 } // namespace remoting |
| OLD | NEW |