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 | 8 |
9 namespace user_manager { | 9 namespace user_manager { |
10 | 10 |
(...skipping 10 matching lines...) Expand all Loading... |
21 } | 21 } |
22 | 22 |
23 void UserManager::UserSessionStateObserver::UserAddedToSession( | 23 void UserManager::UserSessionStateObserver::UserAddedToSession( |
24 const User* active_user) { | 24 const User* active_user) { |
25 } | 25 } |
26 | 26 |
27 void UserManager::UserSessionStateObserver::ActiveUserHashChanged( | 27 void UserManager::UserSessionStateObserver::ActiveUserHashChanged( |
28 const std::string& hash) { | 28 const std::string& hash) { |
29 } | 29 } |
30 | 30 |
| 31 void UserManager::UserSessionStateObserver::UserChangedSupervisedStatus( |
| 32 User* user) { |
| 33 } |
| 34 |
31 UserManager::UserSessionStateObserver::~UserSessionStateObserver() { | 35 UserManager::UserSessionStateObserver::~UserSessionStateObserver() { |
32 } | 36 } |
33 | 37 |
34 UserManager::UserAccountData::UserAccountData( | 38 UserManager::UserAccountData::UserAccountData( |
35 const base::string16& display_name, | 39 const base::string16& display_name, |
36 const base::string16& given_name, | 40 const base::string16& given_name, |
37 const std::string& locale) | 41 const std::string& locale) |
38 : display_name_(display_name), given_name_(given_name), locale_(locale) { | 42 : display_name_(display_name), given_name_(given_name), locale_(locale) { |
39 } | 43 } |
40 | 44 |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
76 } | 80 } |
77 | 81 |
78 // static | 82 // static |
79 UserManager* UserManager::SetForTesting(UserManager* user_manager) { | 83 UserManager* UserManager::SetForTesting(UserManager* user_manager) { |
80 UserManager* previous_instance = UserManager::instance; | 84 UserManager* previous_instance = UserManager::instance; |
81 UserManager::instance = user_manager; | 85 UserManager::instance = user_manager; |
82 return previous_instance; | 86 return previous_instance; |
83 } | 87 } |
84 | 88 |
85 } // namespace user_manager | 89 } // namespace user_manager |
OLD | NEW |