Index: chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc |
diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc b/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc |
index 9b56692b8e30945f987b45426353b6c8b884f622..e53389d1e7667d8a45e069d0683de0192db91434 100644 |
--- a/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc |
+++ b/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc |
@@ -16,6 +16,7 @@ |
#include "base/time/time.h" |
#include "chrome/browser/browser_process.h" |
#include "chrome/browser/chromeos/login/session/user_session_manager.h" |
+#include "chrome/browser/chromeos/login/startup_utils.h" |
#include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" |
#include "chrome/browser/chromeos/policy/user_cloud_external_data_manager.h" |
#include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h" |
@@ -152,7 +153,8 @@ scoped_ptr<UserCloudPolicyManagerChromeOS> |
// TODO(xiyuan): Update the code below after http://crbug.com/462036. |
const bool wait_for_initial_policy = |
!is_browser_restart && |
- chromeos::UserSessionManager::GetInstance()->has_auth_cookies() && |
+ (chromeos::UserSessionManager::GetInstance()->has_auth_cookies() || |
+ chromeos::StartupUtils::IsWebviewSigninEnabled()) && |
xiyuan
2015/04/27 16:33:27
When UserCloudPolicyManagerChromeOS is smart to st
|
(user_manager::UserManager::Get()->IsCurrentUserNew() || |
is_affiliated_user); |