Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(271)

Unified Diff: remoting/host/policy_hack/policy_watcher.cc

Issue 10837022: [Chromoting] Add names of host policies for requiring 2-factor auth, and for the talkgadget name. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/host/policy_hack/policy_watcher.h ('k') | remoting/host/policy_hack/policy_watcher_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
« no previous file with comments | « remoting/host/policy_hack/policy_watcher.h ('k') | remoting/host/policy_hack/policy_watcher_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698