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

Side by Side Diff: chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc

Issue 2766393003: cros: Defer lockscreen updateUserImage and loadUser calls. (Closed)
Patch Set: Created 3 years, 9 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
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/base_webui_handler.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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/ui/webui/chromeos/login/signin_screen_handler.h" 5 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <vector> 10 #include <vector>
(...skipping 1005 matching lines...) Expand 10 before | Expand all | Expand 10 after
1016 } 1016 }
1017 1017
1018 void SigninScreenHandler::OnUserRemoved(const AccountId& account_id, 1018 void SigninScreenHandler::OnUserRemoved(const AccountId& account_id,
1019 bool last_user_removed) { 1019 bool last_user_removed) {
1020 CallJS("login.AccountPickerScreen.removeUser", account_id); 1020 CallJS("login.AccountPickerScreen.removeUser", account_id);
1021 if (last_user_removed) 1021 if (last_user_removed)
1022 OnShowAddUser(); 1022 OnShowAddUser();
1023 } 1023 }
1024 1024
1025 void SigninScreenHandler::OnUserImageChanged(const user_manager::User& user) { 1025 void SigninScreenHandler::OnUserImageChanged(const user_manager::User& user) {
1026 if (page_is_ready()) 1026 if (page_is_ready()) {
1027 CallJS("login.AccountPickerScreen.updateUserImage", user.GetAccountId()); 1027 // TODO(jdufault): Remove DCHECK after resolving crbug.com/699798
1028 DCHECK(is_js_initialized_and_ready());
1029 CallJSOrDefer("login.AccountPickerScreen.updateUserImage",
1030 user.GetAccountId());
1031 }
1028 } 1032 }
1029 1033
1030 void SigninScreenHandler::OnPreferencesChanged() { 1034 void SigninScreenHandler::OnPreferencesChanged() {
1031 // Make sure that one of the login UI is fully functional now, otherwise 1035 // Make sure that one of the login UI is fully functional now, otherwise
1032 // preferences update would be picked up next time it will be shown. 1036 // preferences update would be picked up next time it will be shown.
1033 if (!webui_visible_) { 1037 if (!webui_visible_) {
1034 LOG(WARNING) << "Login UI is not active - postponed prefs change."; 1038 LOG(WARNING) << "Login UI is not active - postponed prefs change.";
1035 preferences_changed_delayed_ = true; 1039 preferences_changed_delayed_ = true;
1036 return; 1040 return;
1037 } 1041 }
(...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after
1287 1291
1288 void SigninScreenHandler::HandleToggleKioskAutolaunchScreen() { 1292 void SigninScreenHandler::HandleToggleKioskAutolaunchScreen() {
1289 policy::BrowserPolicyConnectorChromeOS* connector = 1293 policy::BrowserPolicyConnectorChromeOS* connector =
1290 g_browser_process->platform_part()->browser_policy_connector_chromeos(); 1294 g_browser_process->platform_part()->browser_policy_connector_chromeos();
1291 if (delegate_ && !connector->IsEnterpriseManaged()) 1295 if (delegate_ && !connector->IsEnterpriseManaged())
1292 delegate_->ShowKioskAutolaunchScreen(); 1296 delegate_->ShowKioskAutolaunchScreen();
1293 } 1297 }
1294 1298
1295 void SigninScreenHandler::LoadUsers(const base::ListValue& users_list, 1299 void SigninScreenHandler::LoadUsers(const base::ListValue& users_list,
1296 bool showGuest) { 1300 bool showGuest) {
1297 CallJS("login.AccountPickerScreen.loadUsers", 1301 // TODO(jdufault): Remove DCHECK after resolving crbug.com/699798
1298 users_list, 1302 DCHECK(is_js_initialized_and_ready());
1299 delegate_->IsShowGuest()); 1303 CallJSOrDefer("login.AccountPickerScreen.loadUsers", users_list,
1304 delegate_->IsShowGuest());
1300 } 1305 }
1301 1306
1302 void SigninScreenHandler::HandleAccountPickerReady() { 1307 void SigninScreenHandler::HandleAccountPickerReady() {
1303 VLOG(0) << "Login WebUI >> AccountPickerReady"; 1308 VLOG(0) << "Login WebUI >> AccountPickerReady";
1304 1309
1305 if (delegate_ && !ScreenLocker::default_screen_locker() && 1310 if (delegate_ && !ScreenLocker::default_screen_locker() &&
1306 !chromeos::IsMachineHWIDCorrect() && 1311 !chromeos::IsMachineHWIDCorrect() &&
1307 !oobe_ui_) { 1312 !oobe_ui_) {
1308 delegate_->ShowWrongHWIDScreen(); 1313 delegate_->ShowWrongHWIDScreen();
1309 return; 1314 return;
(...skipping 329 matching lines...) Expand 10 before | Expand all | Expand 10 after
1639 rate.initial_delay_in_ms = auto_repeat_delay; 1644 rate.initial_delay_in_ms = auto_repeat_delay;
1640 rate.repeat_interval_in_ms = auto_repeat_interval; 1645 rate.repeat_interval_in_ms = auto_repeat_interval;
1641 input_method::InputMethodManager::Get() 1646 input_method::InputMethodManager::Get()
1642 ->GetImeKeyboard() 1647 ->GetImeKeyboard()
1643 ->SetAutoRepeatEnabled(true); 1648 ->SetAutoRepeatEnabled(true);
1644 input_method::InputMethodManager::Get()->GetImeKeyboard()->SetAutoRepeatRate( 1649 input_method::InputMethodManager::Get()->GetImeKeyboard()->SetAutoRepeatRate(
1645 rate); 1650 rate);
1646 } 1651 }
1647 1652
1648 } // namespace chromeos 1653 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/base_webui_handler.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698