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

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

Issue 335833003: Rename "managed (mode|user)" to "supervised user" (part 2) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review comments (+ a few other cleanups) 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 87654180c749607f628612f1c8b771bf8b318edb..13a8ce084af6e2dea064c2af1e481885c0a3f02c 100644
--- a/chrome/browser/sync/managed_user_signin_manager_wrapper.cc
+++ b/chrome/browser/sync/managed_user_signin_manager_wrapper.cc
@@ -9,7 +9,7 @@
#include "google_apis/gaia/gaia_constants.h"
#if defined(ENABLE_MANAGED_USERS)
-#include "chrome/browser/managed_mode/managed_user_constants.h"
+#include "chrome/browser/supervised_user/supervised_user_constants.h"
#endif
ManagedUserSigninManagerWrapper::ManagedUserSigninManagerWrapper(
@@ -28,7 +28,7 @@ std::string ManagedUserSigninManagerWrapper::GetEffectiveUsername() const {
const std::string& auth_username = original_->GetAuthenticatedUsername();
#if defined(ENABLE_MANAGED_USERS)
if (auth_username.empty() && profile_->IsSupervised())
- return managed_users::kManagedUserPseudoEmail;
+ return supervised_users::kSupervisedUserPseudoEmail;
#endif
return auth_username;
}
@@ -37,7 +37,7 @@ std::string ManagedUserSigninManagerWrapper::GetAccountIdToUse() const {
const std::string& auth_account = original_->GetAuthenticatedAccountId();
#if defined(ENABLE_MANAGED_USERS)
if (auth_account.empty() && profile_->IsSupervised())
- return managed_users::kManagedUserPseudoEmail;
+ return supervised_users::kSupervisedUserPseudoEmail;
#endif
return auth_account;
}
« no previous file with comments | « chrome/browser/supervised_user/supervised_users.h ('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