| Index: chrome/browser/chromeos/login/users/multi_profile_user_controller.cc
|
| diff --git a/chrome/browser/chromeos/login/users/multi_profile_user_controller.cc b/chrome/browser/chromeos/login/users/multi_profile_user_controller.cc
|
| index 787e73e62ceaa573f9bfb60df3df22ed4ce54ebf..8e53e977fae8388856f0cabcbb674f563598477b 100644
|
| --- a/chrome/browser/chromeos/login/users/multi_profile_user_controller.cc
|
| +++ b/chrome/browser/chromeos/login/users/multi_profile_user_controller.cc
|
| @@ -128,17 +128,16 @@ MultiProfileUserController::GetPrimaryUserPolicy() {
|
| }
|
|
|
| // static
|
| -MultiProfileUserController::MultiProfileUserBehavior
|
| -MultiProfileUserController::UserBehaviorStringToEnum(
|
| +MultiProfileUserBehavior MultiProfileUserController::UserBehaviorStringToEnum(
|
| const std::string& behavior) {
|
| if (behavior == kBehaviorPrimaryOnly)
|
| - return MultiProfileUserBehavior::kPrimaryOnly;
|
| + return MultiProfileUserBehavior::PRIMARY_ONLY;
|
| if (behavior == kBehaviorNotAllowed)
|
| - return MultiProfileUserBehavior::kNotAllowed;
|
| + return MultiProfileUserBehavior::NOT_ALLOWED;
|
| if (behavior == kBehaviorOwnerPrimaryOnly)
|
| - return MultiProfileUserBehavior::kOwnerPrimaryOnly;
|
| + return MultiProfileUserBehavior::OWNER_PRIMARY_ONLY;
|
|
|
| - return MultiProfileUserBehavior::kUnrestriced;
|
| + return MultiProfileUserBehavior::UNRESTRICTED;
|
| }
|
|
|
| bool MultiProfileUserController::IsUserAllowedInSession(
|
|
|