diff options
| author | dmaclach@chromium.org <dmaclach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-20 21:58:43 +0000 |
|---|---|---|
| committer | dmaclach@chromium.org <dmaclach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-20 21:58:43 +0000 |
| commit | bbc9d3397375076984d56979151af9e5bf25c164 (patch) | |
| tree | ec481c89edcec9da52dddd41c235de94941dc139 | |
| parent | 0175a7054fc731298d8ad585d88718b33cc25ed5 (diff) | |
| download | chromium_src-bbc9d3397375076984d56979151af9e5bf25c164.zip chromium_src-bbc9d3397375076984d56979151af9e5bf25c164.tar.gz chromium_src-bbc9d3397375076984d56979151af9e5bf25c164.tar.bz2 | |
Set policy for Windows to ON by default.
BUG=97290
TEST=Use Chromoting on a windows box over a NAT.
Review URL: http://codereview.chromium.org/7983014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102035 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | remoting/host/plugin/policy_hack/nat_policy.cc | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/remoting/host/plugin/policy_hack/nat_policy.cc b/remoting/host/plugin/policy_hack/nat_policy.cc index 07a28de..c32ed37 100644 --- a/remoting/host/plugin/policy_hack/nat_policy.cc +++ b/remoting/host/plugin/policy_hack/nat_policy.cc @@ -88,9 +88,18 @@ void NatPolicy::UpdateNatPolicy(base::DictionaryValue* new_policy) { if (!new_policy->HasKey(kNatPolicyName)) { // If unspecified, the default value of this policy is true. // - // TODO(ajwong): Currently defaults to false until we have policy - // implemented and verified in all 3 platforms. + // TODO(dmaclach): Currently defaults to false on Mac and Linux until we + // have polices in place on those platforms. +#if defined(OS_WIN) + new_nat_enabled_state = true; +#elif defined(OS_MACOSX) new_nat_enabled_state = false; +#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. |