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 582 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
593 CreateHostSessionManager(network_settings, | 593 CreateHostSessionManager(network_settings, |
594 host_context_->url_request_context_getter())); | 594 host_context_->url_request_context_getter())); |
595 host_->AddStatusObserver(this); | 595 host_->AddStatusObserver(this); |
596 log_to_server_.reset( | 596 log_to_server_.reset( |
597 new LogToServer(host_, ServerLogEntry::IT2ME, signal_strategy_.get())); | 597 new LogToServer(host_, ServerLogEntry::IT2ME, signal_strategy_.get())); |
598 base::Closure disconnect_callback = base::Bind( | 598 base::Closure disconnect_callback = base::Bind( |
599 &ChromotingHost::Shutdown, base::Unretained(host_.get()), | 599 &ChromotingHost::Shutdown, base::Unretained(host_.get()), |
600 base::Closure()); | 600 base::Closure()); |
601 it2me_host_user_interface_->Start(host_.get(), disconnect_callback); | 601 it2me_host_user_interface_->Start(host_.get(), disconnect_callback); |
602 host_event_logger_ = HostEventLogger::Create(host_, kApplicationName); | 602 host_event_logger_ = HostEventLogger::Create(host_, kApplicationName); |
| 603 host_event_logger_->OnStart(uid); |
603 | 604 |
604 { | 605 { |
605 base::AutoLock auto_lock(ui_strings_lock_); | 606 base::AutoLock auto_lock(ui_strings_lock_); |
606 host_->SetUiStrings(ui_strings_); | 607 host_->SetUiStrings(ui_strings_); |
607 } | 608 } |
608 | 609 |
609 signal_strategy_->Connect(); | 610 signal_strategy_->Connect(); |
610 host_->Start(); | 611 host_->Start(); |
611 | 612 |
612 SetState(kRequestedAccessCode); | 613 SetState(kRequestedAccessCode); |
(...skipping 685 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1298 return is_good; | 1299 return is_good; |
1299 } | 1300 } |
1300 | 1301 |
1301 void HostNPScriptObject::SetException(const std::string& exception_string) { | 1302 void HostNPScriptObject::SetException(const std::string& exception_string) { |
1302 DCHECK(plugin_task_runner_->BelongsToCurrentThread()); | 1303 DCHECK(plugin_task_runner_->BelongsToCurrentThread()); |
1303 g_npnetscape_funcs->setexception(parent_, exception_string.c_str()); | 1304 g_npnetscape_funcs->setexception(parent_, exception_string.c_str()); |
1304 LOG(INFO) << exception_string; | 1305 LOG(INFO) << exception_string; |
1305 } | 1306 } |
1306 | 1307 |
1307 } // namespace remoting | 1308 } // namespace remoting |
OLD | NEW |