Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / policy / configuration_policy_handler_list_factory.cc

diff --git a/src/chrome/browser/policy/configuration_policy_handler_list_factory.cc b/src/chrome/browser/policy/configuration_policy_handler_list_factory.cc
index 877733a..506756a 100644 (file)
--- a/src/chrome/browser/policy/configuration_policy_handler_list_factory.cc
+++ b/src/chrome/browser/policy/configuration_policy_handler_list_factory.cc
@@ -18,6 +18,8 @@
 #include "components/policy/core/common/policy_details.h"
 #include "components/policy/core/common/policy_map.h"
 #include "components/policy/core/common/policy_pref_names.h"
+#include "components/policy/core/common/schema.h"
+#include "components/translate/core/common/translate_pref_names.h"
 #include "grit/component_strings.h"
 #include "policy/policy_constants.h"
 
@@ -420,6 +422,9 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = {
   { key::kHighContrastEnabled,
     prefs::kHighContrastEnabled,
     base::Value::TYPE_BOOLEAN },
+  { key::kVirtualKeyboardEnabled,
+    prefs::kVirtualKeyboardEnabled,
+    base::Value::TYPE_BOOLEAN },
   { key::kDeviceLoginScreenDefaultLargeCursorEnabled,
     NULL,
     base::Value::TYPE_BOOLEAN },
@@ -429,6 +434,9 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = {
   { key::kDeviceLoginScreenDefaultHighContrastEnabled,
     NULL,
     base::Value::TYPE_BOOLEAN },
+  { key::kDeviceLoginScreenDefaultVirtualKeyboardEnabled,
+    NULL,
+    base::Value::TYPE_BOOLEAN },
   { key::kRebootAfterUpdate,
     prefs::kRebootAfterUpdate,
     base::Value::TYPE_BOOLEAN },
@@ -473,7 +481,8 @@ StringToIntEnumListPolicyHandler::MappingEntry kExtensionAllowedTypesMap[] = {
 
 }  // namespace
 
-scoped_ptr<ConfigurationPolicyHandlerList> BuildHandlerList() {
+scoped_ptr<ConfigurationPolicyHandlerList> BuildHandlerList(
+    const Schema& chrome_schema) {
   scoped_ptr<ConfigurationPolicyHandlerList> handlers(
       new ConfigurationPolicyHandlerList(base::Bind(&GetChromePolicyDetails)));
   for (size_t i = 0; i < arraysize(kSimplePolicyMap); ++i) {
@@ -620,6 +629,12 @@ scoped_ptr<ConfigurationPolicyHandlerList> BuildHandlerList() {
                                 0,
                                 INT_MAX,
                                 true)));
+  handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>(
+      new IntRangePolicyHandler(key::kSAMLOfflineSigninTimeLimit,
+                                prefs::kSAMLOfflineSigninTimeLimit,
+                                -1,
+                                INT_MAX,
+                                true)));
   handlers->AddHandler(
       make_scoped_ptr<ConfigurationPolicyHandler>(new IntRangePolicyHandler(
           key::kIdleActionAC,