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

Unified Diff: chrome/browser/sync/managed_user_signin_manager_wrapper.cc

Issue 281433004: Cleanup: Pull Managed User logic out of ProfileSyncService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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/sync/managed_user_signin_manager_wrapper.cc
diff --git a/chrome/browser/sync/managed_user_signin_manager_wrapper.cc b/chrome/browser/sync/managed_user_signin_manager_wrapper.cc
index 6d54006aacf5e90f372c66144b595e671023cdb2..960bde5740471b84e3fedb12cfe50f22f2237be3 100644
--- a/chrome/browser/sync/managed_user_signin_manager_wrapper.cc
+++ b/chrome/browser/sync/managed_user_signin_manager_wrapper.cc
@@ -6,6 +6,7 @@
#include "chrome/browser/profiles/profile.h"
#include "components/signin/core/browser/signin_manager_base.h"
+#include "google_apis/gaia/gaia_constants.h"
#if defined(ENABLE_MANAGED_USERS)
#include "chrome/browser/managed_mode/managed_user_constants.h"
@@ -40,3 +41,12 @@ std::string ManagedUserSigninManagerWrapper::GetAccountIdToUse() const {
#endif
return auth_account;
}
+
+std::string ManagedUserSigninManagerWrapper::GetSyncScopeToUse() const {
+#if defined(ENABLE_MANAGED_USERS)
+ const std::string& auth_account = original_->GetAuthenticatedAccountId();
+ if (auth_account.empty() && profile_->IsManaged())
+ return GaiaConstants::kChromeSyncManagedOAuth2Scope;
+#endif
+ return GaiaConstants::kChromeSyncOAuth2Scope;
+}
« no previous file with comments | « chrome/browser/sync/managed_user_signin_manager_wrapper.h ('k') | chrome/browser/sync/profile_sync_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698