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

Side by Side Diff: chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc

Issue 628193003: [Easy Unlock] Update handling of the trial easy unlock/signin run (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: autoshow tooltip for hardlock Created 6 years, 2 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/users/chrome_user_manager_impl.h" 5 #include "chrome/browser/chromeos/login/users/chrome_user_manager_impl.h"
6 6
7 #include <cstddef> 7 #include <cstddef>
8 #include <set> 8 #include <set>
9 9
10 #include "ash/multi_profile_uma.h" 10 #include "ash/multi_profile_uma.h"
(...skipping 783 matching lines...) Expand 10 before | Expand all | Expand 10 after
794 const std::string& user_id) { 794 const std::string& user_id) {
795 ChromeUserManager::RemoveNonCryptohomeData(user_id); 795 ChromeUserManager::RemoveNonCryptohomeData(user_id);
796 796
797 WallpaperManager::Get()->RemoveUserWallpaperInfo(user_id); 797 WallpaperManager::Get()->RemoveUserWallpaperInfo(user_id);
798 GetUserImageManager(user_id)->DeleteUserImage(); 798 GetUserImageManager(user_id)->DeleteUserImage();
799 799
800 supervised_user_manager_->RemoveNonCryptohomeData(user_id); 800 supervised_user_manager_->RemoveNonCryptohomeData(user_id);
801 801
802 multi_profile_user_controller_->RemoveCachedValues(user_id); 802 multi_profile_user_controller_->RemoveCachedValues(user_id);
803 803
804 EasyUnlockService::RemoveHardlockStateForUser(user_id); 804 EasyUnlockService::ResetLocalStateForUser(user_id);
805 } 805 }
806 806
807 void 807 void
808 ChromeUserManagerImpl::CleanUpPublicAccountNonCryptohomeDataPendingRemoval() { 808 ChromeUserManagerImpl::CleanUpPublicAccountNonCryptohomeDataPendingRemoval() {
809 PrefService* local_state = GetLocalState(); 809 PrefService* local_state = GetLocalState();
810 const std::string public_account_pending_data_removal = 810 const std::string public_account_pending_data_removal =
811 local_state->GetString(kPublicAccountPendingDataRemoval); 811 local_state->GetString(kPublicAccountPendingDataRemoval);
812 if (public_account_pending_data_removal.empty() || 812 if (public_account_pending_data_removal.empty() ||
813 (IsUserLoggedIn() && 813 (IsUserLoggedIn() &&
814 public_account_pending_data_removal == GetActiveUser()->email())) { 814 public_account_pending_data_removal == GetActiveUser()->email())) {
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
1034 if ((users + GetUsersAllowedForMultiProfile().size()) > 1) 1034 if ((users + GetUsersAllowedForMultiProfile().size()) > 1)
1035 ash::MultiProfileUMA::RecordUserCount(users); 1035 ash::MultiProfileUMA::RecordUserCount(users);
1036 } 1036 }
1037 1037
1038 base::debug::SetCrashKeyValue( 1038 base::debug::SetCrashKeyValue(
1039 crash_keys::kNumberOfUsers, 1039 crash_keys::kNumberOfUsers,
1040 base::StringPrintf("%" PRIuS, GetLoggedInUsers().size())); 1040 base::StringPrintf("%" PRIuS, GetLoggedInUsers().size()));
1041 } 1041 }
1042 1042
1043 } // namespace chromeos 1043 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698