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

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

Issue 177343004: Merge 252080 "Fix double wallpaper animation for public pods." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1847/src/
Patch Set: Created 6 years, 10 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
« no previous file with comments | « chrome/browser/chromeos/login/user_manager_impl.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
===================================================================
--- chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc (revision 252904)
+++ chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc (working copy)
@@ -1290,7 +1290,6 @@
BootTimesLoader::Get()->RecordCurrentStats("login-send-user-list");
base::ListValue users_list;
- size_t first_non_public_account_index = 0;
const UserList& users = delegate_->GetUsers();
// TODO(nkostylev): Move to a separate method in UserManager.
@@ -1302,7 +1301,6 @@
std::string owner;
chromeos::CrosSettings::Get()->GetString(chromeos::kDeviceOwner, &owner);
bool has_owner = owner.size() > 0;
- // if public accounts available, that means there's no device owner
size_t max_non_owner_users = has_owner ? kMaxUsers - 1 : kMaxUsers;
size_t non_owner_count = 0;
@@ -1326,12 +1324,8 @@
if (!is_owner)
++non_owner_count;
- // public accounts come first in the list
- if (is_public_account) {
- users_list.Insert(first_non_public_account_index++, user_dict);
- } else {
- users_list.Append(user_dict);
- }
+
+ users_list.Append(user_dict);
}
}
while (users_list.GetSize() > kMaxUsers)
« no previous file with comments | « chrome/browser/chromeos/login/user_manager_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698