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

Unified Diff: chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc

Issue 11419184: Add public accounts to UserManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Re-upload against the correct upstream commit. Created 8 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
Index: chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
index 140ecbaedb7460e0cc398cbf6546d27dd23696ce..b1d70f5b1298733569fe92d68d1b9c8b7ca97cda 100644
--- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
@@ -68,6 +68,7 @@ const char kKeyUsername[] = "username";
const char kKeyDisplayName[] = "displayName";
const char kKeyEmailAddress[] = "emailAddress";
const char kKeyNameTooltip[] = "nameTooltip";
+const char kKeyPublicAccount[] = "publicAccount";
const char kKeySignedIn[] = "signedIn";
const char kKeyCanRemove[] = "canRemove";
const char kKeyOauthTokenStatus[] = "oauthTokenStatus";
@@ -735,6 +736,7 @@ void SigninScreenHandler::SendUserList(bool animated) {
std::string owner;
chromeos::CrosSettings::Get()->GetString(chromeos::kDeviceOwner, &owner);
bool is_owner = (email == owner);
+ bool public_account = ((*it)->GetType() == User::USER_TYPE_PUBLIC_ACCOUNT);
bool signed_in = *it == UserManager::Get()->GetLoggedInUser();
if (non_owner_count < max_non_owner_users || is_owner) {
@@ -743,6 +745,7 @@ void SigninScreenHandler::SendUserList(bool animated) {
user_dict->SetString(kKeyEmailAddress, (*it)->display_email());
user_dict->SetString(kKeyDisplayName, (*it)->GetDisplayName());
user_dict->SetString(kKeyNameTooltip, (*it)->display_email());
+ user_dict->SetBoolean(kKeyPublicAccount, public_account);
user_dict->SetInteger(kKeyOauthTokenStatus, (*it)->oauth_token_status());
user_dict->SetBoolean(kKeySignedIn, signed_in);
@@ -753,6 +756,7 @@ void SigninScreenHandler::SendUserList(bool animated) {
!single_user &&
!email.empty() &&
!is_owner &&
+ !public_account &&
!signed_in);
users_list.Append(user_dict);

Powered by Google App Engine
This is Rietveld 408576698