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

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

Issue 319273002: Revert 275550 "Revert 275046 "ChromeOS login webui refactoring: ..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 6 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 | Annotate | Revision Log
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 <string> 9 #include <string>
9 10
10 #include "base/bind.h" 11 #include "base/bind.h"
11 #include "base/compiler_specific.h" 12 #include "base/compiler_specific.h"
13 #include "base/timer/timer.h"
14 #include "base/values.h"
12 #include "chrome/browser/chromeos/login/users/user.h" 15 #include "chrome/browser/chromeos/login/users/user.h"
16 #include "chrome/browser/signin/screenlock_bridge.h"
17 #include "ui/wm/core/user_activity_observer.h"
13 18
14 namespace chromeos { 19 namespace chromeos {
15 20
16 class LoginDisplayWebUIHandler; 21 class LoginDisplayWebUIHandler;
17 22
18 // This class represents User Selection screen: user pod-based login screen. 23 // This class represents User Selection screen: user pod-based login screen.
19 class UserSelectionScreen { 24 class UserSelectionScreen : public wm::UserActivityObserver {
20 public: 25 public:
21 UserSelectionScreen(); 26 UserSelectionScreen();
22 virtual ~UserSelectionScreen(); 27 virtual ~UserSelectionScreen();
23 28
24 void SetHandler(LoginDisplayWebUIHandler* handler); 29 void SetHandler(LoginDisplayWebUIHandler* handler);
25 30
26 void Init(const UserList& users); 31 void Init(const UserList& users, bool show_guest);
27 const UserList& GetUsers() const; 32 const UserList& GetUsers() const;
28 void OnUserImageChanged(const User& user); 33 void OnUserImageChanged(const User& user);
29 void OnBeforeUserRemoved(const std::string& username); 34 void OnBeforeUserRemoved(const std::string& username);
30 void OnUserRemoved(const std::string& username); 35 void OnUserRemoved(const std::string& username);
31 36
37 void OnPasswordClearTimerExpired();
38 void SendUserList(bool animated);
39 void HandleGetUsers();
40 void SetAuthType(const std::string& username,
41 ScreenlockBridge::LockHandler::AuthType auth_type);
42 ScreenlockBridge::LockHandler::AuthType GetAuthType(
43 const std::string& username) const;
44
45 // wm::UserActivityDetector implementation:
46 virtual void OnUserActivity(const ui::Event* event) OVERRIDE;
47
48 // Fills |user_dict| with information about |user|.
49 static void FillUserDictionary(
50 User* user,
51 bool is_owner,
52 bool is_signin_to_add,
53 ScreenlockBridge::LockHandler::AuthType auth_type,
54 base::DictionaryValue* user_dict);
55
56 // Determines if user auth status requires online sign in.
57 static bool ShouldForceOnlineSignIn(const User* user);
58
32 private: 59 private:
33 LoginDisplayWebUIHandler* handler_; 60 LoginDisplayWebUIHandler* handler_;
34 61
35 // Set of Users that are visible. 62 // Set of Users that are visible.
36 UserList users_; 63 UserList users_;
37 64
65 // Whether to show guest login.
66 bool show_guest_;
67
68 // Map of usernames to their current authentication type. If a user is not
69 // contained in the map, it is using the default authentication type.
70 std::map<std::string, ScreenlockBridge::LockHandler::AuthType>
71 user_auth_type_map_;
72
73 // Timer for measuring idle state duration before password clear.
74 base::OneShotTimer<UserSelectionScreen> password_clear_timer_;
75
38 DISALLOW_COPY_AND_ASSIGN(UserSelectionScreen); 76 DISALLOW_COPY_AND_ASSIGN(UserSelectionScreen);
39 }; 77 };
40 78
41 } // namespace chromeos 79 } // namespace chromeos
42 80
43 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_USER_SELECTION_SCREEN_H_ 81 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_USER_SELECTION_SCREEN_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698