Chromium Code Reviews| Index: components/user_manager/user_names.h |
| diff --git a/chromeos/login/user_names.h b/components/user_manager/user_names.h |
| similarity index 64% |
| rename from chromeos/login/user_names.h |
| rename to components/user_manager/user_names.h |
| index 62fb333794908adf5b9650b1b5443495381e7b11..981915d40900b32a4d72aca799658b6a48effe98 100644 |
| --- a/chromeos/login/user_names.h |
| +++ b/components/user_manager/user_names.h |
| @@ -7,44 +7,42 @@ |
| #include <string> |
| -#include "chromeos/chromeos_export.h" |
| +#include "components/user_manager/user_manager_export.h" |
| class AccountId; |
| +namespace user_manager { |
| namespace chromeos { |
|
stevenjb
2016/10/26 16:30:39
Do we really need/want this in the chromeos namesp
Alexander Alekseev
2016/10/26 20:41:25
Done.
|
| -namespace login { |
| - |
| // Username for stub login when not running on ChromeOS. |
| -CHROMEOS_EXPORT extern const char kStubUser[]; |
| +USER_MANAGER_EXPORT extern const char kStubUser[]; |
| // Magic e-mail addresses are bad. They exist here because some code already |
| // depends on them and it is hard to figure out what. Any user types added in |
| // the future should be identified by a new |UserType|, not a new magic e-mail |
| // address. |
| // Username for Guest session user. |
| -CHROMEOS_EXPORT extern const char kGuestUserName[]; |
| +USER_MANAGER_EXPORT extern const char kGuestUserName[]; |
| // Domain that is used for all supervised users. |
| -CHROMEOS_EXPORT extern const char kSupervisedUserDomain[]; |
| +USER_MANAGER_EXPORT extern const char kSupervisedUserDomain[]; |
| // Canonicalizes a GAIA user ID, accounting for the legacy guest mode user ID |
| // which does trips up gaia::CanonicalizeEmail() because it does not contain an |
| // @ symbol. |
| -CHROMEOS_EXPORT std::string CanonicalizeUserID(const std::string& user_id); |
| +USER_MANAGER_EXPORT std::string CanonicalizeUserID(const std::string& user_id); |
| -CHROMEOS_EXPORT const AccountId& StubAccountId(); |
| +USER_MANAGER_EXPORT const AccountId& StubAccountId(); |
| // AccountId for the login screen. It identifies ephemeral profile that is used |
| // to display WebUI during OOBE and SignIn. |
| -CHROMEOS_EXPORT const AccountId& SignInAccountId(); |
| - |
| -CHROMEOS_EXPORT const AccountId& GuestAccountId(); |
| +USER_MANAGER_EXPORT const AccountId& SignInAccountId(); |
| -CHROMEOS_EXPORT const AccountId& DemoAccountId(); |
| +USER_MANAGER_EXPORT const AccountId& GuestAccountId(); |
| -} // namespace login |
| +USER_MANAGER_EXPORT const AccountId& DemoAccountId(); |
| } // namespace chromeos |
| +} // namespace user_manager |
| #endif // CHROMEOS_LOGIN_USER_NAMES_H_ |