| 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 03d14c32c32540bb39b95a67ab367cd0bba428af..a254ed87efe31f88e53c7341725c0b62d52769db 100644
|
| --- a/remoting/host/plugin/host_script_object.h
|
| +++ b/remoting/host/plugin/host_script_object.h
|
| @@ -34,6 +34,10 @@ class RegisterSupportHostRequest;
|
| class SignalStrategy;
|
| class SupportAccessVerifier;
|
|
|
| +namespace policy_hack {
|
| +class NatPolicy;
|
| +} // namespace policy_hack
|
| +
|
| // NPAPI plugin implementation for remoting host script object.
|
| // HostNPScriptObject creates threads that are required to run
|
| // ChromotingHost and starts/stops the host on those threads. When
|
| @@ -110,11 +114,17 @@ class HostNPScriptObject : public HostStatusObserver {
|
| void ConnectInternal(const std::string& uid,
|
| const std::string& auth_token,
|
| const std::string& auth_service);
|
| + void ReadPolicyAndConnect(const std::string& uid,
|
| + const std::string& auth_token,
|
| + const std::string& auth_service);
|
| void DisconnectInternal();
|
|
|
| // Callback for ChromotingHost::Shutdown().
|
| void OnShutdownFinished();
|
|
|
| + // Called when the nat traversal policy is updated.
|
| + void OnNatPolicyUpdate(bool nat_traversal_enabled);
|
| +
|
| // Helper function for executing InvokeDefault on an NPObject, and ignoring
|
| // the return value.
|
| bool InvokeAndIgnoreResult(NPObject* func,
|
| @@ -151,6 +161,13 @@ class HostNPScriptObject : public HostStatusObserver {
|
|
|
| base::WaitableEvent disconnected_event_;
|
| base::CancellationFlag destructing_;
|
| +
|
| + // Ensure this object is not watching before deleting.
|
| + scoped_ptr<policy_hack::NatPolicy> nat_policy_;
|
| +
|
| + bool nat_traversal_enabled_;
|
| + bool policy_received_;
|
| + base::Closure pending_connect_;
|
| };
|
|
|
| } // namespace remoting
|
|
|