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

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

Issue 316863002: Rename "managed (mode|user)" to "supervised user" (part 1) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 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/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 960bde5740471b84e3fedb12cfe50f22f2237be3..87654180c749607f628612f1c8b771bf8b318edb 100644
--- a/chrome/browser/sync/managed_user_signin_manager_wrapper.cc
+++ b/chrome/browser/sync/managed_user_signin_manager_wrapper.cc
@@ -27,7 +27,7 @@ SigninManagerBase* ManagedUserSigninManagerWrapper::GetOriginal() {
std::string ManagedUserSigninManagerWrapper::GetEffectiveUsername() const {
const std::string& auth_username = original_->GetAuthenticatedUsername();
#if defined(ENABLE_MANAGED_USERS)
- if (auth_username.empty() && profile_->IsManaged())
+ if (auth_username.empty() && profile_->IsSupervised())
return managed_users::kManagedUserPseudoEmail;
#endif
return auth_username;
@@ -36,7 +36,7 @@ std::string ManagedUserSigninManagerWrapper::GetEffectiveUsername() const {
std::string ManagedUserSigninManagerWrapper::GetAccountIdToUse() const {
const std::string& auth_account = original_->GetAuthenticatedAccountId();
#if defined(ENABLE_MANAGED_USERS)
- if (auth_account.empty() && profile_->IsManaged())
+ if (auth_account.empty() && profile_->IsSupervised())
return managed_users::kManagedUserPseudoEmail;
#endif
return auth_account;
@@ -45,8 +45,8 @@ std::string ManagedUserSigninManagerWrapper::GetAccountIdToUse() const {
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;
+ if (auth_account.empty() && profile_->IsSupervised())
+ return GaiaConstants::kChromeSyncSupervisedOAuth2Scope;
#endif
return GaiaConstants::kChromeSyncOAuth2Scope;
}
« no previous file with comments | « chrome/browser/sync/glue/synced_tab_delegate_android.cc ('k') | chrome/browser/sync/profile_sync_components_factory_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698