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

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

Issue 1412813003: This CL replaces user_manager::UserID with AccountId. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@468875--Chrome-OS-handles-deletion-of-Gmail-account-poorly--Create-AccountID-structure-part2--user_names
Patch Set: Fix Win GN build. Created 5 years, 1 month 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
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>
11 11
12 #include "base/compiler_specific.h" 12 #include "base/compiler_specific.h"
13 #include "base/timer/timer.h" 13 #include "base/timer/timer.h"
14 #include "base/values.h" 14 #include "base/values.h"
15 #include "chrome/browser/chromeos/login/signin/token_handle_util.h" 15 #include "chrome/browser/chromeos/login/signin/token_handle_util.h"
16 #include "chrome/browser/chromeos/login/ui/login_display.h" 16 #include "chrome/browser/chromeos/login/ui/login_display.h"
17 #include "chrome/browser/chromeos/login/ui/models/user_board_model.h" 17 #include "chrome/browser/chromeos/login/ui/models/user_board_model.h"
18 #include "components/proximity_auth/screenlock_bridge.h" 18 #include "components/proximity_auth/screenlock_bridge.h"
19 #include "components/user_manager/user.h" 19 #include "components/user_manager/user.h"
20 #include "components/user_manager/user_id.h"
21 #include "ui/base/user_activity/user_activity_observer.h" 20 #include "ui/base/user_activity/user_activity_observer.h"
22 21
22 class AccountId;
23 class EasyUnlockService; 23 class EasyUnlockService;
24 24
25 namespace chromeos { 25 namespace chromeos {
26 26
27 class LoginDisplayWebUIHandler; 27 class LoginDisplayWebUIHandler;
28 class UserBoardView; 28 class UserBoardView;
29 29
30 // This class represents User Selection screen: user pod-based login screen. 30 // This class represents User Selection screen: user pod-based login screen.
31 class UserSelectionScreen 31 class UserSelectionScreen
32 : public ui::UserActivityObserver, 32 : public ui::UserActivityObserver,
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 115
116 // Map from public session user IDs to recommended locales set by policy. 116 // Map from public session user IDs to recommended locales set by policy.
117 typedef std::map<std::string, std::vector<std::string> > 117 typedef std::map<std::string, std::vector<std::string> >
118 PublicSessionRecommendedLocaleMap; 118 PublicSessionRecommendedLocaleMap;
119 PublicSessionRecommendedLocaleMap public_session_recommended_locales_; 119 PublicSessionRecommendedLocaleMap public_session_recommended_locales_;
120 120
121 private: 121 private:
122 EasyUnlockService* GetEasyUnlockServiceForUser( 122 EasyUnlockService* GetEasyUnlockServiceForUser(
123 const std::string& user_id) const; 123 const std::string& user_id) const;
124 124
125 void OnUserStatusChecked(const user_manager::UserID& user_id, 125 void OnUserStatusChecked(const AccountId& account_id,
126 TokenHandleUtil::TokenHandleStatus status); 126 TokenHandleUtil::TokenHandleStatus status);
127 127
128 // Whether to show guest login. 128 // Whether to show guest login.
129 bool show_guest_; 129 bool show_guest_;
130 130
131 // Purpose of the screen (see constants in OobeUI). 131 // Purpose of the screen (see constants in OobeUI).
132 const std::string display_type_; 132 const std::string display_type_;
133 133
134 // Set of Users that are visible. 134 // Set of Users that are visible.
135 user_manager::UserList users_; 135 user_manager::UserList users_;
(...skipping 10 matching lines...) Expand all
146 scoped_ptr<TokenHandleUtil> token_handle_util_; 146 scoped_ptr<TokenHandleUtil> token_handle_util_;
147 147
148 base::WeakPtrFactory<UserSelectionScreen> weak_factory_; 148 base::WeakPtrFactory<UserSelectionScreen> weak_factory_;
149 149
150 DISALLOW_COPY_AND_ASSIGN(UserSelectionScreen); 150 DISALLOW_COPY_AND_ASSIGN(UserSelectionScreen);
151 }; 151 };
152 152
153 } // namespace chromeos 153 } // namespace chromeos
154 154
155 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_USER_SELECTION_SCREEN_H_ 155 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_USER_SELECTION_SCREEN_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698