OLD | NEW |
---|---|
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/user_manager_impl.h" | 5 #include "chrome/browser/chromeos/login/users/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 864 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
875 WallpaperManager::Get()->OnPolicyFetched(policy, user_id, data.Pass()); | 875 WallpaperManager::Get()->OnPolicyFetched(policy, user_id, data.Pass()); |
876 else | 876 else |
877 NOTREACHED(); | 877 NOTREACHED(); |
878 } | 878 } |
879 | 879 |
880 void UserManagerImpl::OnPolicyUpdated(const std::string& user_id) { | 880 void UserManagerImpl::OnPolicyUpdated(const std::string& user_id) { |
881 const user_manager::User* user = FindUserInList(user_id); | 881 const user_manager::User* user = FindUserInList(user_id); |
882 if (!user || user->GetType() != user_manager::USER_TYPE_PUBLIC_ACCOUNT) | 882 if (!user || user->GetType() != user_manager::USER_TYPE_PUBLIC_ACCOUNT) |
883 return; | 883 return; |
884 UpdatePublicAccountDisplayName(user_id); | 884 UpdatePublicAccountDisplayName(user_id); |
885 NotifyUserListChanged(); | |
Nikita (slow)
2014/07/30 09:27:58
Please rebase with https://codereview.chromium.org
Nikita (slow)
2014/08/01 12:20:22
My CL got reverted, I've found few issues with it,
bartfab (slow)
2014/08/04 13:46:49
Done.
| |
886 } | 885 } |
887 | 886 |
888 void UserManagerImpl::OnDeviceLocalAccountsChanged() { | 887 void UserManagerImpl::OnDeviceLocalAccountsChanged() { |
889 // No action needed here, changes to the list of device-local accounts get | 888 // No action needed here, changes to the list of device-local accounts get |
890 // handled via the kAccountsPrefDeviceLocalAccounts device setting observer. | 889 // handled via the kAccountsPrefDeviceLocalAccounts device setting observer. |
891 } | 890 } |
892 | 891 |
893 bool UserManagerImpl::IsCurrentUserOwner() const { | 892 bool UserManagerImpl::IsCurrentUserOwner() const { |
894 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 893 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
895 base::AutoLock lk(is_current_user_owner_lock_); | 894 base::AutoLock lk(is_current_user_owner_lock_); |
(...skipping 934 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1830 } | 1829 } |
1831 | 1830 |
1832 void UserManagerImpl::DeleteUser(user_manager::User* user) { | 1831 void UserManagerImpl::DeleteUser(user_manager::User* user) { |
1833 const bool is_active_user = (user == active_user_); | 1832 const bool is_active_user = (user == active_user_); |
1834 delete user; | 1833 delete user; |
1835 if (is_active_user) | 1834 if (is_active_user) |
1836 active_user_ = NULL; | 1835 active_user_ = NULL; |
1837 } | 1836 } |
1838 | 1837 |
1839 } // namespace chromeos | 1838 } // namespace chromeos |
OLD | NEW |