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

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

Issue 1470633002: ChromeOS: Fix removeUser button on signin screen. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@462823--Chrome-OS-handles-deletion-of-Gmail-account-poorly--Fix-GetKnownUserAccountId
Patch Set: Rebased. 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/signin_screen_controller.h" 5 #include "chrome/browser/chromeos/login/signin_screen_controller.h"
6 6
7 #include "chrome/browser/chrome_notification_types.h" 7 #include "chrome/browser/chrome_notification_types.h"
8 #include "chrome/browser/chromeos/login/lock/screen_locker.h" 8 #include "chrome/browser/chromeos/login/lock/screen_locker.h"
9 #include "chrome/browser/chromeos/login/screens/chrome_user_selection_screen.h" 9 #include "chrome/browser/chromeos/login/screens/chrome_user_selection_screen.h"
10 #include "chrome/browser/chromeos/login/ui/views/user_board_view.h" 10 #include "chrome/browser/chromeos/login/ui/views/user_board_view.h"
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 } 51 }
52 52
53 void SignInScreenController::OnSigninScreenReady() { 53 void SignInScreenController::OnSigninScreenReady() {
54 gaia_screen_->MaybePreloadAuthExtension(); 54 gaia_screen_->MaybePreloadAuthExtension();
55 user_selection_screen_->InitEasyUnlock(); 55 user_selection_screen_->InitEasyUnlock();
56 if (ScreenLocker::default_screen_locker()) { 56 if (ScreenLocker::default_screen_locker()) {
57 ScreenLocker::default_screen_locker()->delegate()->OnLockWebUIReady(); 57 ScreenLocker::default_screen_locker()->delegate()->OnLockWebUIReady();
58 } 58 }
59 } 59 }
60 60
61 void SignInScreenController::RemoveUser(const std::string& user_id) { 61 void SignInScreenController::RemoveUser(const AccountId& account_id) {
62 user_manager::UserManager::Get()->RemoveUser( 62 user_manager::UserManager::Get()->RemoveUser(account_id, this);
63 AccountId::FromUserEmail(user_id), this);
64 } 63 }
65 64
66 void SignInScreenController::OnBeforeUserRemoved(const std::string& username) { 65 void SignInScreenController::OnBeforeUserRemoved(const AccountId& account_id) {
67 user_selection_screen_->OnBeforeUserRemoved(username); 66 user_selection_screen_->OnBeforeUserRemoved(account_id);
68 } 67 }
69 68
70 void SignInScreenController::OnUserRemoved(const std::string& username) { 69 void SignInScreenController::OnUserRemoved(const AccountId& account_id) {
71 user_selection_screen_->OnUserRemoved(username); 70 user_selection_screen_->OnUserRemoved(account_id);
72 } 71 }
73 72
74 void SignInScreenController::SendUserList() { 73 void SignInScreenController::SendUserList() {
75 user_selection_screen_->HandleGetUsers(); 74 user_selection_screen_->HandleGetUsers();
76 } 75 }
77 76
78 void SignInScreenController::CheckUserStatus(const AccountId& account_id) { 77 void SignInScreenController::CheckUserStatus(const AccountId& account_id) {
79 user_selection_screen_->CheckUserStatus(account_id); 78 user_selection_screen_->CheckUserStatus(account_id);
80 } 79 }
81 80
(...skipping 16 matching lines...) Expand all
98 registrar_.RemoveAll(); 97 registrar_.RemoveAll();
99 return; 98 return;
100 } else if (type == chrome::NOTIFICATION_LOGIN_USER_IMAGE_CHANGED) { 99 } else if (type == chrome::NOTIFICATION_LOGIN_USER_IMAGE_CHANGED) {
101 user_selection_screen_->OnUserImageChanged( 100 user_selection_screen_->OnUserImageChanged(
102 *content::Details<user_manager::User>(details).ptr()); 101 *content::Details<user_manager::User>(details).ptr());
103 return; 102 return;
104 } 103 }
105 } 104 }
106 105
107 } // namespace chromeos 106 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/signin_screen_controller.h ('k') | chrome/browser/chromeos/login/ui/mock_login_display.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698