Chromium Code Reviews| Index: chrome/browser/policy/cloud/user_policy_signin_service.cc |
| diff --git a/chrome/browser/policy/cloud/user_policy_signin_service.cc b/chrome/browser/policy/cloud/user_policy_signin_service.cc |
| index 46b60ca542c783409145a4d091439742f60ddd07..84037e7149b9c0d9d434d4fc084baaacc2758711 100644 |
| --- a/chrome/browser/policy/cloud/user_policy_signin_service.cc |
| +++ b/chrome/browser/policy/cloud/user_policy_signin_service.cc |
| @@ -32,6 +32,10 @@ |
| #include "google_apis/gaia/oauth2_access_token_consumer.h" |
| #include "google_apis/gaia/oauth2_access_token_fetcher.h" |
| +#if defined(ENABLE_MANAGED_USERS) |
| +#include "chrome/browser/managed_mode/managed_user_service.h" |
| +#endif |
| + |
| namespace em = enterprise_management; |
| namespace { |
| @@ -229,6 +233,11 @@ UserPolicySigninService::UserPolicySigninService( |
| if (profile_->GetPrefs()->GetBoolean(prefs::kDisableCloudPolicyOnSignin)) |
| return; |
| +#if defined(ENABLE_MANAGED_USERS) |
| + if (ManagedUserService::ProfileIsManaged(profile_)) |
|
Bernhard Bauer
2013/06/17 14:23:53
Hm, turns out this doesn't work with newly created
Joao da Silva
2013/06/17 14:26:02
sgtm. Also registrar_.RemoveAll() then.
Bernhard Bauer
2013/06/17 14:36:10
Done.
|
| + return; |
| +#endif |
| + |
| // Initialize/shutdown the UserCloudPolicyManager when the user signs out. |
| registrar_.Add(this, |
| chrome::NOTIFICATION_GOOGLE_SIGNED_OUT, |
| @@ -399,7 +408,7 @@ void UserPolicySigninService::Observe( |
| *(content::Details<const TokenService::TokenAvailableDetails>( |
| details).ptr()); |
| if (token_details.service() == |
| - GaiaConstants::kGaiaOAuth2LoginRefreshToken) { |
| + GaiaConstants::kGaiaOAuth2LoginRefreshToken) { |
| SigninManager* signin_manager = |
| SigninManagerFactory::GetForProfile(profile_); |
| std::string username = signin_manager->GetAuthenticatedUsername(); |