| Index: remoting/host/plugin/host_script_object.h
|
| diff --git a/remoting/host/plugin/host_script_object.h b/remoting/host/plugin/host_script_object.h
|
| index 3769cb9bb70b9fb822c197f2370aac6e1aeba4da..d52ce71c756b2fc0217f12b544d2e98215e74482 100644
|
| --- a/remoting/host/plugin/host_script_object.h
|
| +++ b/remoting/host/plugin/host_script_object.h
|
| @@ -20,6 +20,7 @@
|
| #include "remoting/base/plugin_message_loop_proxy.h"
|
| #include "remoting/host/chromoting_host_context.h"
|
| #include "remoting/host/host_status_observer.h"
|
| +#include "remoting/host/log_to_server.h"
|
| #include "remoting/host/plugin/host_plugin_utils.h"
|
| #include "remoting/host/ui_strings.h"
|
| #include "third_party/npapi/bindings/npapi.h"
|
| @@ -177,6 +178,7 @@ class HostNPScriptObject : public HostStatusObserver {
|
| scoped_refptr<PluginMessageLoopProxy> plugin_message_loop_proxy_;
|
|
|
| scoped_ptr<RegisterSupportHostRequest> register_request_;
|
| + scoped_ptr<LogToServer> log_to_server_;
|
| scoped_refptr<MutableHostConfig> host_config_;
|
| ChromotingHostContext host_context_;
|
| scoped_ptr<DesktopEnvironment> desktop_environment_;
|
| @@ -199,11 +201,14 @@ class HostNPScriptObject : public HostStatusObserver {
|
| // Host the current nat traversal policy setting.
|
| bool nat_traversal_enabled_;
|
|
|
| - // Indiciates whether or not a policy has ever been read. This is to ensure
|
| + // Indicates whether or not a policy has ever been read. This is to ensure
|
| // that on startup, we do not accidentally start a connection before we have
|
| // queried our policy restrictions.
|
| bool policy_received_;
|
|
|
| + // Whether logging to a server is enabled.
|
| + bool enable_log_to_server_;
|
| +
|
| // On startup, it is possible to have Connect() called before the policy read
|
| // is completed. Rather than just failing, we thunk the connection call so
|
| // it can be executed after at least one successful policy read. This
|
|
|