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

Side by Side Diff: chrome/browser/chromeos/login/screens/user_selection_screen.h

Issue 1191273002: ChromeOS: Show the new POD RE-AUTH ICON when users needs to re-auth (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update after review. Created 5 years, 5 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 unified diff | Download patch
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/screens/user_selection_screen.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_USER_SELECTION_SCREEN_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_USER_SELECTION_SCREEN_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_USER_SELECTION_SCREEN_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_USER_SELECTION_SCREEN_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 48
49 virtual void Init(const user_manager::UserList& users, bool show_guest); 49 virtual void Init(const user_manager::UserList& users, bool show_guest);
50 const user_manager::UserList& GetUsers() const; 50 const user_manager::UserList& GetUsers() const;
51 void OnUserImageChanged(const user_manager::User& user); 51 void OnUserImageChanged(const user_manager::User& user);
52 void OnBeforeUserRemoved(const std::string& username); 52 void OnBeforeUserRemoved(const std::string& username);
53 void OnUserRemoved(const std::string& username); 53 void OnUserRemoved(const std::string& username);
54 54
55 void OnPasswordClearTimerExpired(); 55 void OnPasswordClearTimerExpired();
56 56
57 void HandleGetUsers(); 57 void HandleGetUsers();
58 void CheckUserStatus(const std::string& user_id); 58
59 // Returns true if user check has started possible, otherwise it returns
Denis Kuznetsov (DE-MUC) 2015/07/09 06:52:48 Please rephrase, I can not understand what method
60 // false. Note, that "false" may be a temporary status, as other check
61 // request for this user might be in progress.
62 bool CheckUserStatus(const std::string& user_id);
59 63
60 // ui::UserActivityDetector implementation: 64 // ui::UserActivityDetector implementation:
61 void OnUserActivity(const ui::Event* event) override; 65 void OnUserActivity(const ui::Event* event) override;
62 66
63 void InitEasyUnlock(); 67 void InitEasyUnlock();
64 68
65 // proximity_auth::ScreenlockBridge::LockHandler implementation: 69 // proximity_auth::ScreenlockBridge::LockHandler implementation:
66 void ShowBannerMessage(const base::string16& message) override; 70 void ShowBannerMessage(const base::string16& message) override;
67 void ShowUserPodCustomIcon( 71 void ShowUserPodCustomIcon(
68 const std::string& user_email, 72 const std::string& user_email,
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 120
117 // Map from public session user IDs to recommended locales set by policy. 121 // Map from public session user IDs to recommended locales set by policy.
118 typedef std::map<std::string, std::vector<std::string> > 122 typedef std::map<std::string, std::vector<std::string> >
119 PublicSessionRecommendedLocaleMap; 123 PublicSessionRecommendedLocaleMap;
120 PublicSessionRecommendedLocaleMap public_session_recommended_locales_; 124 PublicSessionRecommendedLocaleMap public_session_recommended_locales_;
121 125
122 private: 126 private:
123 EasyUnlockService* GetEasyUnlockServiceForUser( 127 EasyUnlockService* GetEasyUnlockServiceForUser(
124 const std::string& user_id) const; 128 const std::string& user_id) const;
125 129
130 // Run CheckUserStatus() on all users.
131 void CheckAllUserStatuses();
132
126 void OnUserStatusChecked(const user_manager::UserID& user_id, 133 void OnUserStatusChecked(const user_manager::UserID& user_id,
127 TokenHandleUtil::TokenHandleStatus status); 134 TokenHandleUtil::TokenHandleStatus status);
128 135
129 // Whether to show guest login. 136 // Whether to show guest login.
130 bool show_guest_; 137 bool show_guest_;
131 138
132 // Purpose of the screen (see constants in OobeUI). 139 // Purpose of the screen (see constants in OobeUI).
133 const std::string display_type_; 140 const std::string display_type_;
134 141
135 // Set of Users that are visible. 142 // Set of Users that are visible.
(...skipping 11 matching lines...) Expand all
147 scoped_ptr<TokenHandleUtil> token_handle_util_; 154 scoped_ptr<TokenHandleUtil> token_handle_util_;
148 155
149 base::WeakPtrFactory<UserSelectionScreen> weak_factory_; 156 base::WeakPtrFactory<UserSelectionScreen> weak_factory_;
150 157
151 DISALLOW_COPY_AND_ASSIGN(UserSelectionScreen); 158 DISALLOW_COPY_AND_ASSIGN(UserSelectionScreen);
152 }; 159 };
153 160
154 } // namespace chromeos 161 } // namespace chromeos
155 162
156 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_USER_SELECTION_SCREEN_H_ 163 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_USER_SELECTION_SCREEN_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/screens/user_selection_screen.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698