Index: chrome/browser/chromeos/login/parallel_authenticator.cc |
diff --git a/chrome/browser/chromeos/login/parallel_authenticator.cc b/chrome/browser/chromeos/login/parallel_authenticator.cc |
index 741f44b2237f6097d5860f56acab5e6d254394c2..85ae4b9739f53f3c7e48bcb36fd416e20073f0ec 100644 |
--- a/chrome/browser/chromeos/login/parallel_authenticator.cc |
+++ b/chrome/browser/chromeos/login/parallel_authenticator.cc |
@@ -346,7 +346,7 @@ void ParallelAuthenticator::LoginAsPublicAccount(const std::string& username) { |
} |
void ParallelAuthenticator::LoginAsKioskAccount( |
- const std::string& app_user_id) { |
+ const std::string& app_user_id, bool force_ephemeral) { |
bartfab (slow)
2014/02/13 19:51:53
This violates the style guide. Either the entire d
rkc
2014/02/13 23:22:01
Done.
|
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
current_state_.reset(new AuthAttemptState( |
UserContext(app_user_id, |
@@ -357,9 +357,10 @@ void ParallelAuthenticator::LoginAsKioskAccount( |
User::USER_TYPE_KIOSK_APP, |
false)); |
remove_user_data_on_failure_ = true; |
+ int ephemeral_flag = force_ephemeral ? cryptohome::ENSURE_EPHEMERAL : 0; |
bartfab (slow)
2014/02/13 19:51:53
Nit: const
rkc
2014/02/13 23:22:01
Done.
|
MountPublic(current_state_.get(), |
scoped_refptr<ParallelAuthenticator>(this), |
- cryptohome::CREATE_IF_MISSING); |
+ cryptohome::CREATE_IF_MISSING | ephemeral_flag); |
} |
void ParallelAuthenticator::OnRetailModeLoginSuccess() { |