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

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

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 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 24 matching lines...) Expand all
35 void AppLaunchSigninScreen::Show() { 35 void AppLaunchSigninScreen::Show() {
36 InitOwnerUserList(); 36 InitOwnerUserList();
37 oobe_ui_->web_ui()->CallJavascriptFunction( 37 oobe_ui_->web_ui()->CallJavascriptFunction(
38 "login.AccountPickerScreen.setShouldShowApps", 38 "login.AccountPickerScreen.setShouldShowApps",
39 base::FundamentalValue(false)); 39 base::FundamentalValue(false));
40 oobe_ui_->ShowSigninScreen(LoginScreenContext(), this, NULL); 40 oobe_ui_->ShowSigninScreen(LoginScreenContext(), this, NULL);
41 } 41 }
42 42
43 void AppLaunchSigninScreen::InitOwnerUserList() { 43 void AppLaunchSigninScreen::InitOwnerUserList() {
44 user_manager::UserManager* user_manager = GetUserManager(); 44 user_manager::UserManager* user_manager = GetUserManager();
45 const std::string& owner_email = user_manager->GetOwnerEmail(); 45 const std::string& owner_email =
46 user_manager->GetOwnerAccountId().GetUserEmail();
46 const user_manager::UserList& all_users = user_manager->GetUsers(); 47 const user_manager::UserList& all_users = user_manager->GetUsers();
47 48
48 owner_user_list_.clear(); 49 owner_user_list_.clear();
49 for (user_manager::UserList::const_iterator it = all_users.begin(); 50 for (user_manager::UserList::const_iterator it = all_users.begin();
50 it != all_users.end(); 51 it != all_users.end();
51 ++it) { 52 ++it) {
52 user_manager::User* user = *it; 53 user_manager::User* user = *it;
53 if (user->email() == owner_email) { 54 if (user->email() == owner_email) {
54 owner_user_list_.push_back(user); 55 owner_user_list_.push_back(user);
55 break; 56 break;
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 216
216 void AppLaunchSigninScreen::CheckUserStatus(const std::string& user_id) { 217 void AppLaunchSigninScreen::CheckUserStatus(const std::string& user_id) {
217 } 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