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

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

Issue 1016113002: Instrument "Remove this person" in user manager. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix ChromeOS Supervised User creation/deletion browser tests. Created 5 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
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 <algorithm> 7 #include <algorithm>
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/shell.h" 10 #include "ash/shell.h"
(...skipping 29 matching lines...) Expand all
40 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h" 40 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
41 #include "chrome/browser/chromeos/login/wizard_controller.h" 41 #include "chrome/browser/chromeos/login/wizard_controller.h"
42 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" 42 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
43 #include "chrome/browser/chromeos/policy/consumer_management_service.h" 43 #include "chrome/browser/chromeos/policy/consumer_management_service.h"
44 #include "chrome/browser/chromeos/policy/consumer_management_stage.h" 44 #include "chrome/browser/chromeos/policy/consumer_management_stage.h"
45 #include "chrome/browser/chromeos/policy/device_local_account.h" 45 #include "chrome/browser/chromeos/policy/device_local_account.h"
46 #include "chrome/browser/chromeos/profiles/profile_helper.h" 46 #include "chrome/browser/chromeos/profiles/profile_helper.h"
47 #include "chrome/browser/chromeos/settings/cros_settings.h" 47 #include "chrome/browser/chromeos/settings/cros_settings.h"
48 #include "chrome/browser/io_thread.h" 48 #include "chrome/browser/io_thread.h"
49 #include "chrome/browser/profiles/profile.h" 49 #include "chrome/browser/profiles/profile.h"
50 #include "chrome/browser/profiles/profile_metrics.h"
50 #include "chrome/browser/signin/easy_unlock_service.h" 51 #include "chrome/browser/signin/easy_unlock_service.h"
51 #include "chrome/browser/ui/webui/chromeos/login/error_screen_handler.h" 52 #include "chrome/browser/ui/webui/chromeos/login/error_screen_handler.h"
52 #include "chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h" 53 #include "chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h"
53 #include "chrome/browser/ui/webui/chromeos/login/l10n_util.h" 54 #include "chrome/browser/ui/webui/chromeos/login/l10n_util.h"
54 #include "chrome/browser/ui/webui/chromeos/login/native_window_delegate.h" 55 #include "chrome/browser/ui/webui/chromeos/login/native_window_delegate.h"
55 #include "chrome/browser/ui/webui/chromeos/login/network_state_informer.h" 56 #include "chrome/browser/ui/webui/chromeos/login/network_state_informer.h"
56 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" 57 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
57 #include "chrome/common/pref_names.h" 58 #include "chrome/common/pref_names.h"
58 #include "chrome/common/url_constants.h" 59 #include "chrome/common/url_constants.h"
59 #include "chrome/grit/chromium_strings.h" 60 #include "chrome/grit/chromium_strings.h"
(...skipping 424 matching lines...) Expand 10 before | Expand all | Expand 10 after
484 &SigninScreenHandler::HandleShowLoadingTimeoutError); 485 &SigninScreenHandler::HandleShowLoadingTimeoutError);
485 AddCallback("updateOfflineLogin", 486 AddCallback("updateOfflineLogin",
486 &SigninScreenHandler::HandleUpdateOfflineLogin); 487 &SigninScreenHandler::HandleUpdateOfflineLogin);
487 AddCallback("focusPod", &SigninScreenHandler::HandleFocusPod); 488 AddCallback("focusPod", &SigninScreenHandler::HandleFocusPod);
488 AddCallback("getPublicSessionKeyboardLayouts", 489 AddCallback("getPublicSessionKeyboardLayouts",
489 &SigninScreenHandler::HandleGetPublicSessionKeyboardLayouts); 490 &SigninScreenHandler::HandleGetPublicSessionKeyboardLayouts);
490 AddCallback("cancelConsumerManagementEnrollment", 491 AddCallback("cancelConsumerManagementEnrollment",
491 &SigninScreenHandler::HandleCancelConsumerManagementEnrollment); 492 &SigninScreenHandler::HandleCancelConsumerManagementEnrollment);
492 AddCallback("getTouchViewState", 493 AddCallback("getTouchViewState",
493 &SigninScreenHandler::HandleGetTouchViewState); 494 &SigninScreenHandler::HandleGetTouchViewState);
495 AddCallback("logRemoveUserWarningShown",
496 &SigninScreenHandler::HandleLogRemoveUserWarningShown);
494 497
495 // This message is sent by the kiosk app menu, but is handled here 498 // This message is sent by the kiosk app menu, but is handled here
496 // so we can tell the delegate to launch the app. 499 // so we can tell the delegate to launch the app.
497 AddCallback("launchKioskApp", &SigninScreenHandler::HandleLaunchKioskApp); 500 AddCallback("launchKioskApp", &SigninScreenHandler::HandleLaunchKioskApp);
498 } 501 }
499 502
500 void SigninScreenHandler::Show(const LoginScreenContext& context) { 503 void SigninScreenHandler::Show(const LoginScreenContext& context) {
501 CHECK(delegate_); 504 CHECK(delegate_);
502 505
503 // Just initialize internal fields from context and call ShowImpl(). 506 // Just initialize internal fields from context and call ShowImpl().
(...skipping 760 matching lines...) Expand 10 before | Expand all | Expand 10 after
1264 ShowImpl(); 1267 ShowImpl();
1265 } 1268 }
1266 1269
1267 void SigninScreenHandler::HandleGetTouchViewState() { 1270 void SigninScreenHandler::HandleGetTouchViewState() {
1268 if (max_mode_delegate_) { 1271 if (max_mode_delegate_) {
1269 CallJS("login.AccountPickerScreen.setTouchViewState", 1272 CallJS("login.AccountPickerScreen.setTouchViewState",
1270 max_mode_delegate_->IsMaximizeModeEnabled()); 1273 max_mode_delegate_->IsMaximizeModeEnabled());
1271 } 1274 }
1272 } 1275 }
1273 1276
1277 void SigninScreenHandler::HandleLogRemoveUserWarningShown() {
1278 ProfileMetrics::LogProfileDeleteUser(
1279 ProfileMetrics::DELETE_PROFILE_USER_MANAGER_SHOW_WARNING);
1280 }
1281
1274 bool SigninScreenHandler::AllWhitelistedUsersPresent() { 1282 bool SigninScreenHandler::AllWhitelistedUsersPresent() {
1275 CrosSettings* cros_settings = CrosSettings::Get(); 1283 CrosSettings* cros_settings = CrosSettings::Get();
1276 bool allow_new_user = false; 1284 bool allow_new_user = false;
1277 cros_settings->GetBoolean(kAccountsPrefAllowNewUser, &allow_new_user); 1285 cros_settings->GetBoolean(kAccountsPrefAllowNewUser, &allow_new_user);
1278 if (allow_new_user) 1286 if (allow_new_user)
1279 return false; 1287 return false;
1280 user_manager::UserManager* user_manager = user_manager::UserManager::Get(); 1288 user_manager::UserManager* user_manager = user_manager::UserManager::Get();
1281 const user_manager::UserList& users = user_manager->GetUsers(); 1289 const user_manager::UserList& users = user_manager->GetUsers();
1282 if (!delegate_ || users.size() > kMaxUsers) { 1290 if (!delegate_ || users.size() > kMaxUsers) {
1283 return false; 1291 return false;
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
1361 return gaia_screen_handler_->frame_error(); 1369 return gaia_screen_handler_->frame_error();
1362 } 1370 }
1363 1371
1364 void SigninScreenHandler::OnCapsLockChanged(bool enabled) { 1372 void SigninScreenHandler::OnCapsLockChanged(bool enabled) {
1365 caps_lock_enabled_ = enabled; 1373 caps_lock_enabled_ = enabled;
1366 if (page_is_ready()) 1374 if (page_is_ready())
1367 CallJS("login.AccountPickerScreen.setCapsLockState", caps_lock_enabled_); 1375 CallJS("login.AccountPickerScreen.setCapsLockState", caps_lock_enabled_);
1368 } 1376 }
1369 1377
1370 } // namespace chromeos 1378 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698