| 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 212 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 223 host_context_->ui_task_runner()->PostTask( | 223 host_context_->ui_task_runner()->PostTask( |
| 224 FROM_HERE, | 224 FROM_HERE, |
| 225 base::Bind(&It2MeImpl::Connect, this, uid, auth_token, auth_service, | 225 base::Bind(&It2MeImpl::Connect, this, uid, auth_token, auth_service, |
| 226 ui_strings)); | 226 ui_strings)); |
| 227 return; | 227 return; |
| 228 } | 228 } |
| 229 | 229 |
| 230 desktop_environment_factory_.reset(new BasicDesktopEnvironmentFactory( | 230 desktop_environment_factory_.reset(new BasicDesktopEnvironmentFactory( |
| 231 host_context_->network_task_runner(), | 231 host_context_->network_task_runner(), |
| 232 host_context_->input_task_runner(), | 232 host_context_->input_task_runner(), |
| 233 host_context_->ui_task_runner())); | 233 host_context_->ui_task_runner(), |
| 234 ui_strings)); |
| 234 | 235 |
| 235 // Start monitoring configured policies. | 236 // Start monitoring configured policies. |
| 236 policy_watcher_.reset( | 237 policy_watcher_.reset( |
| 237 policy_hack::PolicyWatcher::Create(host_context_->network_task_runner())); | 238 policy_hack::PolicyWatcher::Create(host_context_->network_task_runner())); |
| 238 policy_watcher_->StartWatching( | 239 policy_watcher_->StartWatching( |
| 239 base::Bind(&It2MeImpl::OnPolicyUpdate, this)); | 240 base::Bind(&It2MeImpl::OnPolicyUpdate, this)); |
| 240 | 241 |
| 241 // The UserInterface object needs to be created on the UI thread. | 242 // The UserInterface object needs to be created on the UI thread. |
| 242 it2me_host_user_interface_.reset( | 243 it2me_host_user_interface_.reset( |
| 243 new It2MeHostUserInterface(host_context_->network_task_runner(), | 244 new It2MeHostUserInterface(host_context_->network_task_runner(), |
| (...skipping 1339 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1583 } | 1584 } |
| 1584 | 1585 |
| 1585 void HostNPScriptObject::SetException(const std::string& exception_string) { | 1586 void HostNPScriptObject::SetException(const std::string& exception_string) { |
| 1586 DCHECK(plugin_task_runner_->BelongsToCurrentThread()); | 1587 DCHECK(plugin_task_runner_->BelongsToCurrentThread()); |
| 1587 | 1588 |
| 1588 g_npnetscape_funcs->setexception(parent_, exception_string.c_str()); | 1589 g_npnetscape_funcs->setexception(parent_, exception_string.c_str()); |
| 1589 LOG(INFO) << exception_string; | 1590 LOG(INFO) << exception_string; |
| 1590 } | 1591 } |
| 1591 | 1592 |
| 1592 } // namespace remoting | 1593 } // namespace remoting |
| OLD | NEW |