Upstream version 5.34.104.0

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

diff --git a/src/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc b/src/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc
index d5b8e5c..c7d976e 100644 (file)
--- a/src/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc
+++ b/src/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc
@@ -15,6 +15,7 @@
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/time/time.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/chromeos/login/login_utils.h"
 #include "chrome/browser/chromeos/login/user.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
@@ -199,6 +200,15 @@ scoped_ptr<UserCloudPolicyManagerChromeOS>
           base::MessageLoopProxy::current(),
           file_task_runner,
           io_task_runner));
+
+  bool wildcard_match = false;
+  if (connector->IsEnterpriseManaged() &&
+      chromeos::LoginUtils::IsWhitelisted(username, &wildcard_match) &&
+      wildcard_match &&
+      !connector->IsNonEnterpriseUser(username)) {
+    manager->EnableWildcardLoginCheck(username);
+  }
+
   manager->Init(SchemaRegistryServiceFactory::GetForContext(profile));
   manager->Connect(g_browser_process->local_state(),
                    device_management_service,