From 547bfbb040c71ac0e02061994ca2c22950a7e84e Mon Sep 17 00:00:00 2001 From: "bartfab@chromium.org" Date: Thu, 7 Aug 2014 16:31:36 +0000 Subject: [PATCH] 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 --- .../browser/chromeos/login/screens/chrome_user_selection_screen.cc | 6 +++--- chrome/browser/chromeos/login/screens/user_selection_screen.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/chrome/browser/chromeos/login/screens/chrome_user_selection_screen.cc b/chrome/browser/chromeos/login/screens/chrome_user_selection_screen.cc index 15187a46410a..00332b438c45 100644 --- a/chrome/browser/chromeos/login/screens/chrome_user_selection_screen.cc +++ b/chrome/browser/chromeos/login/screens/chrome_user_selection_screen.cc @@ -43,9 +43,9 @@ void ChromeUserSelectionScreen::Init(const user_manager::UserList& users, bool show_guest) { UserSelectionScreen::Init(users, show_guest); - // Retrieve the current policy for |users_|. - for (user_manager::UserList::const_iterator it = users_.begin(); - it != users_.end(); ++it) { + // Retrieve the current policy for all users. + for (user_manager::UserList::const_iterator it = users.begin(); + it != users.end(); ++it) { if ((*it)->GetType() == user_manager::USER_TYPE_PUBLIC_ACCOUNT) OnPolicyUpdated((*it)->GetUserID()); } diff --git a/chrome/browser/chromeos/login/screens/user_selection_screen.h b/chrome/browser/chromeos/login/screens/user_selection_screen.h index b986de0cfbb9..6302e2d4e665 100644 --- a/chrome/browser/chromeos/login/screens/user_selection_screen.h +++ b/chrome/browser/chromeos/login/screens/user_selection_screen.h @@ -65,9 +65,6 @@ class UserSelectionScreen : public wm::UserActivityObserver { protected: LoginDisplayWebUIHandler* handler_; - // Set of Users that are visible. - user_manager::UserList users_; - // Map from public session user IDs to recommended locales set by policy. typedef std::map > PublicSessionRecommendedLocaleMap; @@ -77,6 +74,9 @@ class UserSelectionScreen : public wm::UserActivityObserver { // Whether to show guest login. 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 // contained in the map, it is using the default authentication type. std::map -- 2.11.4.GIT