Commit 547bfbb0 authored by bartfab@chromium.org's avatar bartfab@chromium.org

Make UserSelectionScreen::users_ private

ChromeUserSelectionScreen::Init() used to access the |users_| member of
its parent class even though it already knows the user list. This CL
removes the unnecessary access and marks |users_| as private.

BUG=398511
TEST=No compilation errors

Review URL: https://codereview.chromium.org/446383002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@288076 0039d316-1c4b-4281-b951-d872f2087c98
parent 4c75ae7a
...@@ -43,9 +43,9 @@ void ChromeUserSelectionScreen::Init(const user_manager::UserList& users, ...@@ -43,9 +43,9 @@ void ChromeUserSelectionScreen::Init(const user_manager::UserList& users,
bool show_guest) { bool show_guest) {
UserSelectionScreen::Init(users, show_guest); UserSelectionScreen::Init(users, show_guest);
// Retrieve the current policy for |users_|. // Retrieve the current policy for all users.
for (user_manager::UserList::const_iterator it = users_.begin(); for (user_manager::UserList::const_iterator it = users.begin();
it != users_.end(); ++it) { it != users.end(); ++it) {
if ((*it)->GetType() == user_manager::USER_TYPE_PUBLIC_ACCOUNT) if ((*it)->GetType() == user_manager::USER_TYPE_PUBLIC_ACCOUNT)
OnPolicyUpdated((*it)->GetUserID()); OnPolicyUpdated((*it)->GetUserID());
} }
......
...@@ -65,9 +65,6 @@ class UserSelectionScreen : public wm::UserActivityObserver { ...@@ -65,9 +65,6 @@ class UserSelectionScreen : public wm::UserActivityObserver {
protected: protected:
LoginDisplayWebUIHandler* handler_; LoginDisplayWebUIHandler* handler_;
// Set of Users that are visible.
user_manager::UserList users_;
// Map from public session user IDs to recommended locales set by policy. // Map from public session user IDs to recommended locales set by policy.
typedef std::map<std::string, std::vector<std::string> > typedef std::map<std::string, std::vector<std::string> >
PublicSessionRecommendedLocaleMap; PublicSessionRecommendedLocaleMap;
...@@ -77,6 +74,9 @@ class UserSelectionScreen : public wm::UserActivityObserver { ...@@ -77,6 +74,9 @@ class UserSelectionScreen : public wm::UserActivityObserver {
// Whether to show guest login. // Whether to show guest login.
bool show_guest_; bool show_guest_;
// Set of Users that are visible.
user_manager::UserList users_;
// Map of usernames to their current authentication type. If a user is not // Map of usernames to their current authentication type. If a user is not
// contained in the map, it is using the default authentication type. // contained in the map, it is using the default authentication type.
std::map<std::string, ScreenlockBridge::LockHandler::AuthType> std::map<std::string, ScreenlockBridge::LockHandler::AuthType>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment