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

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

Issue 441143002: Revert 287581 "Allow recommended locales to be set for public se..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 4 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 <map>
9 #include <string> 9 #include <string>
10 #include <vector>
11 10
12 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
13 #include "base/timer/timer.h" 12 #include "base/timer/timer.h"
14 #include "base/values.h" 13 #include "base/values.h"
15 #include "chrome/browser/signin/screenlock_bridge.h" 14 #include "chrome/browser/signin/screenlock_bridge.h"
16 #include "components/user_manager/user.h" 15 #include "components/user_manager/user.h"
17 #include "ui/wm/core/user_activity_observer.h" 16 #include "ui/wm/core/user_activity_observer.h"
18 17
19 namespace chromeos { 18 namespace chromeos {
20 19
(...skipping 28 matching lines...) Expand all
49 48
50 // wm::UserActivityDetector implementation: 49 // wm::UserActivityDetector implementation:
51 virtual void OnUserActivity(const ui::Event* event) OVERRIDE; 50 virtual void OnUserActivity(const ui::Event* event) OVERRIDE;
52 51
53 // Fills |user_dict| with information about |user|. 52 // Fills |user_dict| with information about |user|.
54 static void FillUserDictionary( 53 static void FillUserDictionary(
55 user_manager::User* user, 54 user_manager::User* user,
56 bool is_owner, 55 bool is_owner,
57 bool is_signin_to_add, 56 bool is_signin_to_add,
58 ScreenlockBridge::LockHandler::AuthType auth_type, 57 ScreenlockBridge::LockHandler::AuthType auth_type,
59 const std::vector<std::string>* public_session_recommended_locales,
60 base::DictionaryValue* user_dict); 58 base::DictionaryValue* user_dict);
61 59
62 // Determines if user auth status requires online sign in. 60 // Determines if user auth status requires online sign in.
63 static bool ShouldForceOnlineSignIn(const user_manager::User* user); 61 static bool ShouldForceOnlineSignIn(const user_manager::User* user);
64 62
65 protected: 63 protected:
66 LoginDisplayWebUIHandler* handler_; 64 LoginDisplayWebUIHandler* handler_;
67 65
68 // Set of Users that are visible. 66 // Set of Users that are visible.
69 user_manager::UserList users_; 67 user_manager::UserList users_;
70 68
71 // Map from public session user IDs to recommended locales set by policy.
72 typedef std::map<std::string, std::vector<std::string> >
73 PublicSessionRecommendedLocaleMap;
74 PublicSessionRecommendedLocaleMap public_session_recommended_locales_;
75
76 private: 69 private:
77 // Whether to show guest login. 70 // Whether to show guest login.
78 bool show_guest_; 71 bool show_guest_;
79 72
80 // Map of usernames to their current authentication type. If a user is not 73 // Map of usernames to their current authentication type. If a user is not
81 // contained in the map, it is using the default authentication type. 74 // contained in the map, it is using the default authentication type.
82 std::map<std::string, ScreenlockBridge::LockHandler::AuthType> 75 std::map<std::string, ScreenlockBridge::LockHandler::AuthType>
83 user_auth_type_map_; 76 user_auth_type_map_;
84 77
85 // Timer for measuring idle state duration before password clear. 78 // Timer for measuring idle state duration before password clear.
86 base::OneShotTimer<UserSelectionScreen> password_clear_timer_; 79 base::OneShotTimer<UserSelectionScreen> password_clear_timer_;
87 80
88 DISALLOW_COPY_AND_ASSIGN(UserSelectionScreen); 81 DISALLOW_COPY_AND_ASSIGN(UserSelectionScreen);
89 }; 82 };
90 83
91 } // namespace chromeos 84 } // namespace chromeos
92 85
93 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_USER_SELECTION_SCREEN_H_ 86 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_USER_SELECTION_SCREEN_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698