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

Unified Diff: chrome/browser/chromeos/login/parallel_authenticator.cc

Issue 205713002: Add a basic demo mode browser test. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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/chromeos/login/parallel_authenticator.cc
diff --git a/chrome/browser/chromeos/login/parallel_authenticator.cc b/chrome/browser/chromeos/login/parallel_authenticator.cc
index 29ffe01df4da276ab7900e54bca1ab2e094bd509..d92967375018e3b4a66af7e74a61cfbe3c1a5cd9 100644
--- a/chrome/browser/chromeos/login/parallel_authenticator.cc
+++ b/chrome/browser/chromeos/login/parallel_authenticator.cc
@@ -346,11 +346,11 @@ void ParallelAuthenticator::LoginAsPublicAccount(const std::string& username) {
}
void ParallelAuthenticator::LoginAsKioskAccount(
- const std::string& app_user_id, bool force_ephemeral) {
+ const std::string& app_user_id, bool force_guest) {
bartfab (slow) 2014/03/20 13:22:29 Nit: Put each argument on a separate line.
rkc 2014/03/20 21:45:01 Done.
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- std::string user_id =
- force_ephemeral ? UserManager::kGuestUserName : app_user_id;
+ const std::string user_id =
+ force_guest ? UserManager::kGuestUserName : app_user_id;
current_state_.reset(new AuthAttemptState(
UserContext(user_id,
std::string(), // password
@@ -361,7 +361,7 @@ void ParallelAuthenticator::LoginAsKioskAccount(
false));
remove_user_data_on_failure_ = true;
- if (!force_ephemeral) {
+ if (!force_guest) {
MountPublic(current_state_.get(),
scoped_refptr<ParallelAuthenticator>(this),
cryptohome::CREATE_IF_MISSING);

Powered by Google App Engine
This is Rietveld 408576698