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

Side by Side Diff: chrome/browser/chromeos/login/signin_screen_controller.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 (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 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 } 68 }
69 69
70 void SignInScreenController::OnUserRemoved(const std::string& username) { 70 void SignInScreenController::OnUserRemoved(const std::string& username) {
71 user_selection_screen_->OnUserRemoved(username); 71 user_selection_screen_->OnUserRemoved(username);
72 } 72 }
73 73
74 void SignInScreenController::SendUserList() { 74 void SignInScreenController::SendUserList() {
75 user_selection_screen_->HandleGetUsers(); 75 user_selection_screen_->HandleGetUsers();
76 } 76 }
77 77
78 void SignInScreenController::CheckUserStatus(const AccountId& account_id) { 78 void SignInScreenController::CheckUserStatus(const std::string& user_id) {
79 user_selection_screen_->CheckUserStatus(account_id); 79 user_selection_screen_->CheckUserStatus(user_id);
80 } 80 }
81 81
82 void SignInScreenController::SetWebUIHandler( 82 void SignInScreenController::SetWebUIHandler(
83 LoginDisplayWebUIHandler* webui_handler) { 83 LoginDisplayWebUIHandler* webui_handler) {
84 webui_handler_ = webui_handler; 84 webui_handler_ = webui_handler;
85 gaia_screen_->SetLegacyHandler(webui_handler_); 85 gaia_screen_->SetLegacyHandler(webui_handler_);
86 user_selection_screen_->SetHandler(webui_handler_); 86 user_selection_screen_->SetHandler(webui_handler_);
87 } 87 }
88 88
89 void SignInScreenController::Observe( 89 void SignInScreenController::Observe(
90 int type, 90 int type,
91 const content::NotificationSource& source, 91 const content::NotificationSource& source,
92 const content::NotificationDetails& details) { 92 const content::NotificationDetails& details) {
93 if (type == chrome::NOTIFICATION_SESSION_STARTED) { 93 if (type == chrome::NOTIFICATION_SESSION_STARTED) {
94 // Stop listening to any notification once session has started. 94 // Stop listening to any notification once session has started.
95 // Sign in screen objects are marked for deletion with DeleteSoon so 95 // Sign in screen objects are marked for deletion with DeleteSoon so
96 // make sure no object would be used after session has started. 96 // make sure no object would be used after session has started.
97 // http://crbug.com/125276 97 // http://crbug.com/125276
98 registrar_.RemoveAll(); 98 registrar_.RemoveAll();
99 return; 99 return;
100 } else if (type == chrome::NOTIFICATION_LOGIN_USER_IMAGE_CHANGED) { 100 } else if (type == chrome::NOTIFICATION_LOGIN_USER_IMAGE_CHANGED) {
101 user_selection_screen_->OnUserImageChanged( 101 user_selection_screen_->OnUserImageChanged(
102 *content::Details<user_manager::User>(details).ptr()); 102 *content::Details<user_manager::User>(details).ptr());
103 return; 103 return;
104 } 104 }
105 } 105 }
106 106
107 } // namespace chromeos 107 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698