diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-16 00:13:56 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-16 00:13:56 +0000 |
| commit | ddaf98a89a9e9f6ea353ca2ef4b89e8c89f53005 (patch) | |
| tree | 3be1c37731fc9fe91a27efbb58949ad9bda31cb9 /remoting/remoting.gyp | |
| parent | ff8b0e30c9665cd6d22516a2944d33d0a63bec81 (diff) | |
| download | chromium_src-ddaf98a89a9e9f6ea353ca2ef4b89e8c89f53005.zip chromium_src-ddaf98a89a9e9f6ea353ca2ef4b89e8c89f53005.tar.gz chromium_src-ddaf98a89a9e9f6ea353ca2ef4b89e8c89f53005.tar.bz2 | |
Respect NAT traversal policy in the Me2Me host.
Now the Me2Me host uses the same policy value that It2Me checks to determine if NAT traversal should be enabled. policy_hack has been moved to remoting/host because now it is used not only by the plugin. Also fixed a bug in the policy loader that would cause 5 seconds delay when starting (affects It2Me too).
BUG=114254
Review URL: http://codereview.chromium.org/9401022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122195 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/remoting.gyp')
| -rw-r--r-- | remoting/remoting.gyp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index 55b8bb8..6ad01ef 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -308,11 +308,6 @@ 'host/plugin/host_plugin_utils.h', 'host/plugin/host_script_object.cc', 'host/plugin/host_script_object.h', - 'host/plugin/policy_hack/nat_policy.h', - 'host/plugin/policy_hack/nat_policy.cc', - 'host/plugin/policy_hack/nat_policy_linux.cc', - 'host/plugin/policy_hack/nat_policy_mac.mm', - 'host/plugin/policy_hack/nat_policy_win.cc', ], 'conditions': [ ['OS=="mac"', { @@ -574,6 +569,11 @@ 'host/local_input_monitor_win.cc', 'host/log_to_server.cc', 'host/log_to_server.h', + 'host/policy_hack/nat_policy.h', + 'host/policy_hack/nat_policy.cc', + 'host/policy_hack/nat_policy_linux.cc', + 'host/policy_hack/nat_policy_mac.mm', + 'host/policy_hack/nat_policy_win.cc', 'host/register_support_host_request.cc', 'host/register_support_host_request.h', 'host/screen_recorder.cc', |