[Chromoting] Add names of host policies for requiring 2-factor auth, and for the talkgadget name.

remoting/host/policy_hack/policy_watcher.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Most of this code is copied from:
 //   src/chrome/browser/policy/asynchronous_policy_loader.{h,cc}
 
 #include "remoting/host/policy_hack/policy_watcher.h"
 
 #include "base/bind.h"
@@ skipping 70 matching lines @@
                          default_if_value_not_string)));
 }
 
 // Copies all policy values from one dictionary to another, using default values
 // when necessary.
 scoped_ptr<base::DictionaryValue> AddDefaultValuesWhenNecessary(
     const base::DictionaryValue* from) {
   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();
 }
 
 }  // namespace
 
 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);
 
 PolicyWatcher::PolicyWatcher(
     scoped_refptr<base::SingleThreadTaskRunner> task_runner)
     : task_runner_(task_runner),
       old_policies_(new base::DictionaryValue()),
       ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
 }
@@ skipping 72 matching lines @@
   old_policies_.swap(new_policies);
 
   // Notify our client of the changed policies.
   if (!changed_policies->empty()) {
     policy_callback_.Run(changed_policies.Pass());
   }
 }
 
 }  // namespace policy_hack
 }  // namespace remoting