diff options
author | jamiewalch@chromium.org <jamiewalch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-13 21:17:54 +0000 |
---|---|---|
committer | jamiewalch@chromium.org <jamiewalch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-13 21:17:54 +0000 |
commit | 60e2ac088098110b2970d04618529d9b3ebfa404 (patch) | |
tree | 684f595aa95ec2ef0c7a7b7e8de7748511c415de /remoting | |
parent | f3f4c4a59ba30bf85387bfe47a4e560278fee6ad (diff) | |
download | chromium_src-60e2ac088098110b2970d04618529d9b3ebfa404.zip chromium_src-60e2ac088098110b2970d04618529d9b3ebfa404.tar.gz chromium_src-60e2ac088098110b2970d04618529d9b3ebfa404.tar.bz2 |
Add Chromoting curtain-mode policy.
BUG=110111
Review URL: https://chromiumcodereview.appspot.com/10827265
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151350 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
-rw-r--r-- | remoting/host/policy_hack/policy_watcher.cc | 6 | ||||
-rw-r--r-- | remoting/host/policy_hack/policy_watcher.h | 3 | ||||
-rw-r--r-- | remoting/host/policy_hack/policy_watcher_unittest.cc | 1 |
3 files changed, 10 insertions, 0 deletions
diff --git a/remoting/host/policy_hack/policy_watcher.cc b/remoting/host/policy_hack/policy_watcher.cc index 0d19772..4217076 100644 --- a/remoting/host/policy_hack/policy_watcher.cc +++ b/remoting/host/policy_hack/policy_watcher.cc @@ -97,6 +97,9 @@ scoped_ptr<base::DictionaryValue> AddDefaultValuesWhenNecessary( CopyStringOrDefault(to.get(), from, PolicyWatcher::kHostTalkGadgetPrefixPolicyName, kDefaultTalkGadgetPrefix, kDefaultTalkGadgetPrefix); + CopyBooleanOrDefault(to.get(), from, + PolicyWatcher::kHostRequireCurtainPolicyName, + false, false); return to.Pass(); } @@ -115,6 +118,9 @@ const char PolicyWatcher::kHostDomainPolicyName[] = const char PolicyWatcher::kHostTalkGadgetPrefixPolicyName[] = "RemoteAccessHostTalkGadgetPrefix"; +const char PolicyWatcher::kHostRequireCurtainPolicyName[] = + "RemoteAccessHostRequireCurtain"; + const char* const PolicyWatcher::kBooleanPolicyNames[] = { PolicyWatcher::kNatPolicyName, PolicyWatcher::kHostRequireTwoFactorPolicyName diff --git a/remoting/host/policy_hack/policy_watcher.h b/remoting/host/policy_hack/policy_watcher.h index 4ad54cf..ca59b4e 100644 --- a/remoting/host/policy_hack/policy_watcher.h +++ b/remoting/host/policy_hack/policy_watcher.h @@ -58,6 +58,9 @@ class PolicyWatcher { // The name of the policy that controls the host talkgadget prefix. static const char kHostTalkGadgetPrefixPolicyName[]; + // The name of the policy for requiring curtain-mode. + static const char kHostRequireCurtainPolicyName[]; + protected: virtual void StartWatchingInternal() = 0; virtual void StopWatchingInternal() = 0; diff --git a/remoting/host/policy_hack/policy_watcher_unittest.cc b/remoting/host/policy_hack/policy_watcher_unittest.cc index 7fb6de3..5267a38 100644 --- a/remoting/host/policy_hack/policy_watcher_unittest.cc +++ b/remoting/host/policy_hack/policy_watcher_unittest.cc @@ -100,6 +100,7 @@ class PolicyWatcherTest : public testing::Test { dict.SetString(PolicyWatcher::kHostDomainPolicyName, ""); dict.SetString(PolicyWatcher::kHostTalkGadgetPrefixPolicyName, kDefaultTalkGadgetPrefix); + dict.SetBoolean(PolicyWatcher::kHostRequireCurtainPolicyName, false); } }; |