| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/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.h" | 9 #include "chrome/browser/browser_process.h" |
| 10 #include "chrome/browser/browser_process_platform_part_chromeos.h" | 10 #include "chrome/browser/browser_process_platform_part_chromeos.h" |
| 11 #include "chrome/browser/chromeos/login/user_manager_impl.h" | 11 #include "chrome/browser/chromeos/login/users/user_manager_impl.h" |
| 12 #include "chrome/browser/chromeos/profiles/profile_helper.h" | 12 #include "chrome/browser/chromeos/profiles/profile_helper.h" |
| 13 #include "chrome/common/chrome_switches.h" | 13 #include "chrome/common/chrome_switches.h" |
| 14 | 14 |
| 15 namespace chromeos { | 15 namespace chromeos { |
| 16 | 16 |
| 17 // static | 17 // static |
| 18 const char UserManager::kStubUser[] = "stub-user@example.com"; | 18 const char UserManager::kStubUser[] = "stub-user@example.com"; |
| 19 | 19 |
| 20 // static | 20 // static |
| 21 const char UserManager::kSignInUser[] = "sign-in-user-id"; | 21 const char UserManager::kSignInUser[] = "sign-in-user-id"; |
| (...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 121 // ProfileHelper has to be initialized after UserManager instance is created. | 121 // ProfileHelper has to be initialized after UserManager instance is created. |
| 122 g_browser_process->platform_part()->profile_helper()->Initialize(); | 122 g_browser_process->platform_part()->profile_helper()->Initialize(); |
| 123 } | 123 } |
| 124 | 124 |
| 125 ScopedTestUserManager::~ScopedTestUserManager() { | 125 ScopedTestUserManager::~ScopedTestUserManager() { |
| 126 UserManager::Get()->Shutdown(); | 126 UserManager::Get()->Shutdown(); |
| 127 UserManager::Destroy(); | 127 UserManager::Destroy(); |
| 128 } | 128 } |
| 129 | 129 |
| 130 } // namespace chromeos | 130 } // namespace chromeos |
| OLD | NEW |