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

Side by Side Diff: chrome/browser/chromeos/login/app_launch_signin_screen.cc

Issue 1454153002: Revert of This CL replaces e-mail with AccountId on user selection screen. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 #include "chrome/browser/chromeos/login/app_launch_signin_screen.h" 5 #include "chrome/browser/chromeos/login/app_launch_signin_screen.h"
6 6
7 #include "base/values.h" 7 #include "base/values.h"
8 #include "chrome/browser/chromeos/login/help_app_launcher.h" 8 #include "chrome/browser/chromeos/login/help_app_launcher.h"
9 #include "chrome/browser/chromeos/login/screens/user_selection_screen.h" 9 #include "chrome/browser/chromeos/login/screens/user_selection_screen.h"
10 #include "chrome/browser/chromeos/login/session/user_session_manager.h" 10 #include "chrome/browser/chromeos/login/session/user_session_manager.h"
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 false, /* is_signin_to_add */ 207 false, /* is_signin_to_add */
208 initial_auth_type, 208 initial_auth_type,
209 NULL, /* public_session_recommended_locales */ 209 NULL, /* public_session_recommended_locales */
210 user_dict); 210 user_dict);
211 users_list.Append(user_dict); 211 users_list.Append(user_dict);
212 } 212 }
213 213
214 webui_handler_->LoadUsers(users_list, false); 214 webui_handler_->LoadUsers(users_list, false);
215 } 215 }
216 216
217 void AppLaunchSigninScreen::CheckUserStatus(const AccountId& account_id) {} 217 void AppLaunchSigninScreen::CheckUserStatus(const std::string& user_id) {
218 }
218 219
219 bool AppLaunchSigninScreen::IsUserWhitelisted(const std::string& user_id) { 220 bool AppLaunchSigninScreen::IsUserWhitelisted(const std::string& user_id) {
220 NOTREACHED(); 221 NOTREACHED();
221 return true; 222 return true;
222 } 223 }
223 224
224 } // namespace chromeos 225 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698