Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2860)

Unified Diff: chrome/browser/policy/cloud/user_policy_signin_service.cc

Issue 15780020: Setup Sync to use OAuth token for managed users. (Closed) Base URL: http://git.chromium.org/chromium/src.git@issue226464a
Patch Set: sync Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..f8398ef846bd9d5c2a558f2bc6d81a1b420cab17 100644
--- a/chrome/browser/policy/cloud/user_policy_signin_service.cc
+++ b/chrome/browser/policy/cloud/user_policy_signin_service.cc
@@ -10,6 +10,7 @@
#include "base/prefs/pref_service.h"
#include "base/values.h"
#include "chrome/browser/browser_process.h"
+#include "chrome/browser/managed_mode/managed_user_service.h"
Joao da Silva 2013/06/12 15:30:29 #ifdef managed mode
Bernhard Bauer 2013/06/12 19:01:39 Done.
#include "chrome/browser/policy/browser_policy_connector.h"
#include "chrome/browser/policy/cloud/cloud_policy_client.h"
#include "chrome/browser/policy/cloud/cloud_policy_service.h"
@@ -399,7 +400,8 @@ void UserPolicySigninService::Observe(
*(content::Details<const TokenService::TokenAvailableDetails>(
details).ptr());
if (token_details.service() ==
- GaiaConstants::kGaiaOAuth2LoginRefreshToken) {
+ GaiaConstants::kGaiaOAuth2LoginRefreshToken &&
+ !ManagedUserService::ProfileIsManaged(profile_)) {
Joao da Silva 2013/06/12 15:30:29 #ifdef after moving
Bernhard Bauer 2013/06/12 19:01:39 Done.
SigninManager* signin_manager =
SigninManagerFactory::GetForProfile(profile_);
std::string username = signin_manager->GetAuthenticatedUsername();

Powered by Google App Engine
This is Rietveld 408576698