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

Unified Diff: components/user_manager/user_names.cc

Issue 2450183002: Rename UserInfo method GetEmail to GetDisplayEmail. (Closed)
Patch Set: Update comment Created 4 years, 1 month 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
« no previous file with comments | « components/user_manager/user_names.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/user_manager/user_names.cc
diff --git a/components/user_manager/user_names.cc b/components/user_manager/user_names.cc
index a7cd67b16ffc565d2db87e5cb77006a6a8834576..b873a3da5d9a7983a2931fabaaf6f998b36d61c7 100644
--- a/components/user_manager/user_names.cc
+++ b/components/user_manager/user_names.cc
@@ -54,12 +54,12 @@ FixedAccountManager::FixedAccountManager()
namespace user_manager {
-constexpr const char kStubUser[] = "stub-user@example.com";
+const char kStubUser[] = "stub-user@example.com";
// Should match cros constant in platform/libchromeos/chromeos/cryptohome.h
-constexpr const char kGuestUserName[] = "$guest";
+const char kGuestUserName[] = "$guest";
-constexpr const char kSupervisedUserDomain[] = "locally-managed.localhost";
+const char kSupervisedUserDomain[] = "locally-managed.localhost";
std::string CanonicalizeUserID(const std::string& user_id) {
if (user_id == kGuestUserName)
@@ -67,6 +67,7 @@ std::string CanonicalizeUserID(const std::string& user_id) {
return gaia::CanonicalizeEmail(user_id);
}
+// Note: StubAccountId is used for all tests, not only ChromeOS tests.
const AccountId& StubAccountId() {
return FixedAccountManager::GetInstance()->stub_account_id();
}
« no previous file with comments | « components/user_manager/user_names.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698