diff options
| author | dmaclach@chromium.org <dmaclach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-02 19:40:12 +0000 |
|---|---|---|
| committer | dmaclach@chromium.org <dmaclach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-02 19:40:12 +0000 |
| commit | d6d995c331449c33877bcc0fe64439f3ed75751a (patch) | |
| tree | 5cb7bcf6c1ab82408e59059719e00aa795a6ae99 | |
| parent | ffa90724cca3f78cb32ce501e5b8b0c99deffd84 (diff) | |
| download | chromium_src-d6d995c331449c33877bcc0fe64439f3ed75751a.zip chromium_src-d6d995c331449c33877bcc0fe64439f3ed75751a.tar.gz chromium_src-d6d995c331449c33877bcc0fe64439f3ed75751a.tar.bz2 | |
Merge 108181 - Change linux NAT traversal default for Chromoting.
The NAT traversal default for all platforms is now true.
BUG=97689
TEST=None
Review URL: http://codereview.chromium.org/8423020
TBR=dmaclach@chromium.org
Review URL: http://codereview.chromium.org/8386050
git-svn-id: svn://svn.chromium.org/chrome/branches/912/src@108332 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | remoting/host/plugin/policy_hack/nat_policy.cc | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/remoting/host/plugin/policy_hack/nat_policy.cc b/remoting/host/plugin/policy_hack/nat_policy.cc index 822e9f0..cbcda8a 100644 --- a/remoting/host/plugin/policy_hack/nat_policy.cc +++ b/remoting/host/plugin/policy_hack/nat_policy.cc @@ -89,19 +89,7 @@ void NatPolicy::UpdateNatPolicy(base::DictionaryValue* new_policy) { bool new_nat_enabled_state = false; if (!new_policy->HasKey(kNatPolicyName)) { // If unspecified, the default value of this policy is true. - // - // TODO(dmaclach): Currently defaults to false on Linux until - // we have policy in place. http://crbug.com/97689 -#if defined(OS_WIN) new_nat_enabled_state = true; -#elif defined(OS_MACOSX) - new_nat_enabled_state = true; -#elif defined(OS_LINUX) - new_nat_enabled_state = false; -#else - // Be conservative for now - new_nat_enabled_state = false; -#endif // defined(OS_WIN) } else { // Otherwise, try to parse the value and only change from false if we get // a successful read. |