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/base64.h" | 7 #include "base/base64.h" |
8 #include "base/bind.h" | 8 #include "base/bind.h" |
9 #include "base/json/json_reader.h" | 9 #include "base/json/json_reader.h" |
10 #include "base/json/json_writer.h" | 10 #include "base/json/json_writer.h" |
11 #include "base/message_loop.h" | 11 #include "base/message_loop.h" |
12 #include "base/message_loop_proxy.h" | 12 #include "base/message_loop_proxy.h" |
13 #include "base/sys_string_conversions.h" | 13 #include "base/sys_string_conversions.h" |
14 #include "base/threading/platform_thread.h" | 14 #include "base/threading/platform_thread.h" |
15 #include "base/utf_string_conversions.h" | 15 #include "base/utf_string_conversions.h" |
| 16 #include "base/values.h" |
16 #include "net/base/net_util.h" | 17 #include "net/base/net_util.h" |
17 #include "remoting/base/auth_token_util.h" | 18 #include "remoting/base/auth_token_util.h" |
18 #include "remoting/host/chromoting_host.h" | 19 #include "remoting/host/chromoting_host.h" |
19 #include "remoting/host/chromoting_host_context.h" | 20 #include "remoting/host/chromoting_host_context.h" |
20 #include "remoting/host/desktop_environment.h" | 21 #include "remoting/host/desktop_environment.h" |
21 #include "remoting/host/host_config.h" | 22 #include "remoting/host/host_config.h" |
22 #include "remoting/host/host_key_pair.h" | 23 #include "remoting/host/host_key_pair.h" |
23 #include "remoting/host/host_secret.h" | 24 #include "remoting/host/host_secret.h" |
24 #include "remoting/host/it2me_host_user_interface.h" | 25 #include "remoting/host/it2me_host_user_interface.h" |
25 #include "remoting/host/plugin/daemon_controller.h" | 26 #include "remoting/host/plugin/daemon_controller.h" |
(...skipping 1093 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1119 return is_good; | 1120 return is_good; |
1120 } | 1121 } |
1121 | 1122 |
1122 void HostNPScriptObject::SetException(const std::string& exception_string) { | 1123 void HostNPScriptObject::SetException(const std::string& exception_string) { |
1123 DCHECK(plugin_message_loop_proxy_->BelongsToCurrentThread()); | 1124 DCHECK(plugin_message_loop_proxy_->BelongsToCurrentThread()); |
1124 g_npnetscape_funcs->setexception(parent_, exception_string.c_str()); | 1125 g_npnetscape_funcs->setexception(parent_, exception_string.c_str()); |
1125 LOG(INFO) << exception_string; | 1126 LOG(INFO) << exception_string; |
1126 } | 1127 } |
1127 | 1128 |
1128 } // namespace remoting | 1129 } // namespace remoting |
OLD | NEW |