| 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 "components/user_manager/user_manager.h" | 5 #include "components/user_manager/user_manager.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "components/signin/core/account_id/account_id.h" | 8 #include "components/signin/core/account_id/account_id.h" |
| 9 | 9 |
| 10 namespace user_manager { | 10 namespace user_manager { |
| 11 | 11 |
| 12 UserManager* UserManager::instance = NULL; | 12 UserManager* UserManager::instance = nullptr; |
| 13 | 13 |
| 14 UserManager::Observer::~Observer() { | 14 UserManager::Observer::~Observer() = default; |
| 15 } | |
| 16 | 15 |
| 17 void UserManager::Observer::LocalStateChanged(UserManager* user_manager) { | 16 void UserManager::Observer::LocalStateChanged(UserManager* user_manager) {} |
| 18 } | 17 |
| 18 void UserManager::Observer::OnUserImageChanged(const User& user) {} |
| 19 |
| 20 void UserManager::Observer::OnUserProfileImageUpdateFailed(const User& user) {} |
| 21 |
| 22 void UserManager::Observer::OnUserProfileImageUpdated( |
| 23 const User& user, |
| 24 const gfx::ImageSkia& profile_image) {} |
| 19 | 25 |
| 20 void UserManager::UserSessionStateObserver::ActiveUserChanged( | 26 void UserManager::UserSessionStateObserver::ActiveUserChanged( |
| 21 const User* active_user) { | 27 const User* active_user) { |
| 22 } | 28 } |
| 23 | 29 |
| 24 void UserManager::UserSessionStateObserver::UserAddedToSession( | 30 void UserManager::UserSessionStateObserver::UserAddedToSession( |
| 25 const User* active_user) { | 31 const User* active_user) { |
| 26 } | 32 } |
| 27 | 33 |
| 28 void UserManager::UserSessionStateObserver::ActiveUserHashChanged( | 34 void UserManager::UserSessionStateObserver::ActiveUserHashChanged( |
| (...skipping 21 matching lines...) Expand all Loading... |
| 50 UserManager::SetInstance(this); | 56 UserManager::SetInstance(this); |
| 51 } | 57 } |
| 52 | 58 |
| 53 // static | 59 // static |
| 54 bool UserManager::IsInitialized() { | 60 bool UserManager::IsInitialized() { |
| 55 return UserManager::instance; | 61 return UserManager::instance; |
| 56 } | 62 } |
| 57 | 63 |
| 58 void UserManager::Destroy() { | 64 void UserManager::Destroy() { |
| 59 DCHECK(UserManager::instance == this); | 65 DCHECK(UserManager::instance == this); |
| 60 UserManager::SetInstance(NULL); | 66 UserManager::SetInstance(nullptr); |
| 61 } | 67 } |
| 62 | 68 |
| 63 // static | 69 // static |
| 64 UserManager* user_manager::UserManager::Get() { | 70 UserManager* user_manager::UserManager::Get() { |
| 65 CHECK(UserManager::instance); | 71 CHECK(UserManager::instance); |
| 66 return UserManager::instance; | 72 return UserManager::instance; |
| 67 } | 73 } |
| 68 | 74 |
| 69 UserManager::~UserManager() { | 75 UserManager::~UserManager() { |
| 70 } | 76 } |
| 71 | 77 |
| 72 // static | 78 // static |
| 73 void UserManager::SetInstance(UserManager* user_manager) { | 79 void UserManager::SetInstance(UserManager* user_manager) { |
| 74 UserManager::instance = user_manager; | 80 UserManager::instance = user_manager; |
| 75 } | 81 } |
| 76 | 82 |
| 77 // static | 83 // static |
| 78 UserManager* user_manager::UserManager::GetForTesting() { | 84 UserManager* user_manager::UserManager::GetForTesting() { |
| 79 return UserManager::instance; | 85 return UserManager::instance; |
| 80 } | 86 } |
| 81 | 87 |
| 82 // static | 88 // static |
| 83 UserManager* UserManager::SetForTesting(UserManager* user_manager) { | 89 UserManager* UserManager::SetForTesting(UserManager* user_manager) { |
| 84 UserManager* previous_instance = UserManager::instance; | 90 UserManager* previous_instance = UserManager::instance; |
| 85 UserManager::instance = user_manager; | 91 UserManager::instance = user_manager; |
| 86 return previous_instance; | 92 return previous_instance; |
| 87 } | 93 } |
| 88 | 94 |
| 89 } // namespace user_manager | 95 } // namespace user_manager |
| OLD | NEW |