| 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.h" | 5 #include "chrome/browser/chromeos/login/users/user_manager.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/prefs/pref_registry_simple.h" | 8 #include "base/prefs/pref_registry_simple.h" |
| 9 #include "chrome/browser/browser_process_platform_part_chromeos.h" | 9 #include "chrome/browser/browser_process_platform_part_chromeos.h" |
| 10 #include "chrome/browser/chromeos/login/users/user_manager_impl.h" | 10 #include "chrome/browser/chromeos/login/users/user_manager_impl.h" |
| (...skipping 15 matching lines...) Expand all Loading... |
| 26 } | 26 } |
| 27 | 27 |
| 28 void UserManager::UserSessionStateObserver::UserAddedToSession( | 28 void UserManager::UserSessionStateObserver::UserAddedToSession( |
| 29 const User* active_user) { | 29 const User* active_user) { |
| 30 } | 30 } |
| 31 | 31 |
| 32 void UserManager::UserSessionStateObserver::ActiveUserHashChanged( | 32 void UserManager::UserSessionStateObserver::ActiveUserHashChanged( |
| 33 const std::string& hash) { | 33 const std::string& hash) { |
| 34 } | 34 } |
| 35 | 35 |
| 36 void UserManager::UserSessionStateObserver:: | |
| 37 PendingUserSessionsRestoreFinished() { | |
| 38 } | |
| 39 | |
| 40 UserManager::UserSessionStateObserver::~UserSessionStateObserver() { | 36 UserManager::UserSessionStateObserver::~UserSessionStateObserver() { |
| 41 } | 37 } |
| 42 | 38 |
| 43 UserManager::UserAccountData::UserAccountData( | 39 UserManager::UserAccountData::UserAccountData( |
| 44 const base::string16& display_name, | 40 const base::string16& display_name, |
| 45 const base::string16& given_name, | 41 const base::string16& given_name, |
| 46 const std::string& locale) | 42 const std::string& locale) |
| 47 : display_name_(display_name), | 43 : display_name_(display_name), |
| 48 given_name_(given_name), | 44 given_name_(given_name), |
| 49 locale_(locale) { | 45 locale_(locale) { |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 103 // ProfileHelper has to be initialized after UserManager instance is created. | 99 // ProfileHelper has to be initialized after UserManager instance is created. |
| 104 ProfileHelper::Get()->Initialize(); | 100 ProfileHelper::Get()->Initialize(); |
| 105 } | 101 } |
| 106 | 102 |
| 107 ScopedTestUserManager::~ScopedTestUserManager() { | 103 ScopedTestUserManager::~ScopedTestUserManager() { |
| 108 UserManager::Get()->Shutdown(); | 104 UserManager::Get()->Shutdown(); |
| 109 UserManager::Destroy(); | 105 UserManager::Destroy(); |
| 110 } | 106 } |
| 111 | 107 |
| 112 } // namespace chromeos | 108 } // namespace chromeos |
| OLD | NEW |