Index: remoting/host/policy_hack/policy_watcher.cc |
diff --git a/remoting/host/policy_hack/policy_watcher.cc b/remoting/host/policy_hack/policy_watcher.cc |
index 33e5d7bc02c0d7d898474d4b2107c0ffcb3ab1e8..6ee7c6a2a89f025ca5bb1e3ee2fe2a56e427b426 100644 |
--- a/remoting/host/policy_hack/policy_watcher.cc |
+++ b/remoting/host/policy_hack/policy_watcher.cc |
@@ -88,8 +88,15 @@ scoped_ptr<base::DictionaryValue> AddDefaultValuesWhenNecessary( |
scoped_ptr<base::DictionaryValue> to(new base::DictionaryValue()); |
CopyBooleanOrDefault(to.get(), from, |
PolicyWatcher::kNatPolicyName, true, false); |
+ CopyBooleanOrDefault(to.get(), from, |
+ PolicyWatcher::kRequireTwoFactorPolicyName, |
+ false, false); |
CopyStringOrDefault(to.get(), from, |
PolicyWatcher::kHostDomainPolicyName, "", ""); |
+ CopyStringOrDefault(to.get(), from, |
+ PolicyWatcher::kTalkGadgetPolicyName, |
+ "chromoting", "chromoting"); |
+ |
return to.Pass(); |
} |
@@ -98,17 +105,27 @@ scoped_ptr<base::DictionaryValue> AddDefaultValuesWhenNecessary( |
const char PolicyWatcher::kNatPolicyName[] = |
"RemoteAccessHostFirewallTraversal"; |
+const char PolicyWatcher::kRequireTwoFactorPolicyName[] = |
+ "RemoteAccessHostRequireTwoFactor"; |
+ |
const char PolicyWatcher::kHostDomainPolicyName[] = |
"RemoteAccessHostDomain"; |
+const char PolicyWatcher::kTalkGadgetPolicyName[] = |
+ "RemoteAccessHostTalkGadget"; |
+ |
const char* const PolicyWatcher::kBooleanPolicyNames[] = |
- { PolicyWatcher::kNatPolicyName }; |
+ { PolicyWatcher::kNatPolicyName, |
+ PolicyWatcher::kRequireTwoFactorPolicyName |
+ }; |
const int PolicyWatcher::kBooleanPolicyNamesNum = |
arraysize(kBooleanPolicyNames); |
const char* const PolicyWatcher::kStringPolicyNames[] = |
- { PolicyWatcher::kHostDomainPolicyName }; |
+ { PolicyWatcher::kHostDomainPolicyName, |
+ PolicyWatcher::kTalkGadgetPolicyName |
+ }; |
const int PolicyWatcher::kStringPolicyNamesNum = |
arraysize(kStringPolicyNames); |