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

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

Issue 1165323004: We should use UserID object to identify users instead of username. Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 months 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 user_manager::UserID& user_id) {
62 user_manager::UserManager::Get()->RemoveUser(user_id, this); 62 user_manager::UserManager::Get()->RemoveUser(user_id, this);
63 } 63 }
64 64
65 void SignInScreenController::OnBeforeUserRemoved(const std::string& username) { 65 void SignInScreenController::OnBeforeUserRemoved(const user_manager::UserID& use r_id) {
66 user_selection_screen_->OnBeforeUserRemoved(username); 66 user_selection_screen_->OnBeforeUserRemoved(user_id);
67 } 67 }
68 68
69 void SignInScreenController::OnUserRemoved(const std::string& username) { 69 void SignInScreenController::OnUserRemoved(const user_manager::UserID& user_id) {
70 user_selection_screen_->OnUserRemoved(username); 70 user_selection_screen_->OnUserRemoved(user_id);
71 } 71 }
72 72
73 void SignInScreenController::SendUserList() { 73 void SignInScreenController::SendUserList() {
74 user_selection_screen_->HandleGetUsers(); 74 user_selection_screen_->HandleGetUsers();
75 } 75 }
76 76
77 const user_manager::UserList& SignInScreenController::GetUsers() { 77 const user_manager::UserList& SignInScreenController::GetUsers() {
78 return user_selection_screen_->GetUsers(); 78 return user_selection_screen_->GetUsers();
79 } 79 }
80 80
81 void SignInScreenController::CheckUserStatus(const std::string& user_id) { 81 void SignInScreenController::CheckUserStatus(const user_manager::UserID& user_id ) {
82 user_selection_screen_->CheckUserStatus(user_id); 82 user_selection_screen_->CheckUserStatus(user_id);
83 } 83 }
84 84
85 void SignInScreenController::SetWebUIHandler( 85 void SignInScreenController::SetWebUIHandler(
86 LoginDisplayWebUIHandler* webui_handler) { 86 LoginDisplayWebUIHandler* webui_handler) {
87 webui_handler_ = webui_handler; 87 webui_handler_ = webui_handler;
88 gaia_screen_->SetLegacyHandler(webui_handler_); 88 gaia_screen_->SetLegacyHandler(webui_handler_);
89 user_selection_screen_->SetHandler(webui_handler_); 89 user_selection_screen_->SetHandler(webui_handler_);
90 } 90 }
91 91
92 void SignInScreenController::Observe( 92 void SignInScreenController::Observe(
93 int type, 93 int type,
94 const content::NotificationSource& source, 94 const content::NotificationSource& source,
95 const content::NotificationDetails& details) { 95 const content::NotificationDetails& details) {
96 if (type == chrome::NOTIFICATION_SESSION_STARTED) { 96 if (type == chrome::NOTIFICATION_SESSION_STARTED) {
97 // Stop listening to any notification once session has started. 97 // Stop listening to any notification once session has started.
98 // Sign in screen objects are marked for deletion with DeleteSoon so 98 // Sign in screen objects are marked for deletion with DeleteSoon so
99 // make sure no object would be used after session has started. 99 // make sure no object would be used after session has started.
100 // http://crbug.com/125276 100 // http://crbug.com/125276
101 registrar_.RemoveAll(); 101 registrar_.RemoveAll();
102 return; 102 return;
103 } else if (type == chrome::NOTIFICATION_LOGIN_USER_IMAGE_CHANGED) { 103 } else if (type == chrome::NOTIFICATION_LOGIN_USER_IMAGE_CHANGED) {
104 user_selection_screen_->OnUserImageChanged( 104 user_selection_screen_->OnUserImageChanged(
105 *content::Details<user_manager::User>(details).ptr()); 105 *content::Details<user_manager::User>(details).ptr());
106 return; 106 return;
107 } 107 }
108 } 108 }
109 109
110 } // namespace chromeos 110 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698