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

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

Issue 1463753002: ChromeOS: This CL fixes bug in UserManager::GetKnownUserAccountId . (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update after review. Created 5 years 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>
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 102
103 // Fills |user_dict| with |user| multi-profile related preferences. 103 // Fills |user_dict| with |user| multi-profile related preferences.
104 static void FillMultiProfileUserPrefs(user_manager::User* user, 104 static void FillMultiProfileUserPrefs(user_manager::User* user,
105 base::DictionaryValue* user_dict, 105 base::DictionaryValue* user_dict,
106 bool is_signin_to_add); 106 bool is_signin_to_add);
107 107
108 // Determines if user auth status requires online sign in. 108 // Determines if user auth status requires online sign in.
109 static bool ShouldForceOnlineSignIn(const user_manager::User* user); 109 static bool ShouldForceOnlineSignIn(const user_manager::User* user);
110 110
111 protected: 111 protected:
112 // This call forms full account id of a known user by email.
113 // This is a temporary call while migrating to AccountId.
114 static AccountId GetAccountIdOfKnownUser(const std::string& user_id);
115
116 LoginDisplayWebUIHandler* handler_; 112 LoginDisplayWebUIHandler* handler_;
117 LoginDisplay::Delegate* login_display_delegate_; 113 LoginDisplay::Delegate* login_display_delegate_;
118 UserBoardView* view_; 114 UserBoardView* view_;
119 115
120 // Map from public session account IDs to recommended locales set by policy. 116 // Map from public session account IDs to recommended locales set by policy.
121 typedef std::map<AccountId, std::vector<std::string> > 117 typedef std::map<AccountId, std::vector<std::string> >
122 PublicSessionRecommendedLocaleMap; 118 PublicSessionRecommendedLocaleMap;
123 PublicSessionRecommendedLocaleMap public_session_recommended_locales_; 119 PublicSessionRecommendedLocaleMap public_session_recommended_locales_;
124 120
125 private: 121 private:
(...skipping 24 matching lines...) Expand all
150 scoped_ptr<TokenHandleUtil> token_handle_util_; 146 scoped_ptr<TokenHandleUtil> token_handle_util_;
151 147
152 base::WeakPtrFactory<UserSelectionScreen> weak_factory_; 148 base::WeakPtrFactory<UserSelectionScreen> weak_factory_;
153 149
154 DISALLOW_COPY_AND_ASSIGN(UserSelectionScreen); 150 DISALLOW_COPY_AND_ASSIGN(UserSelectionScreen);
155 }; 151 };
156 152
157 } // namespace chromeos 153 } // namespace chromeos
158 154
159 #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