| 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/profiles/profile_manager.h" | 5 #include "chrome/browser/profiles/profile_manager.h" |
| 6 | 6 |
| 7 #include <set> | 7 #include <set> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 963 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 974 #if defined(ENABLE_MANAGED_USERS) | 974 #if defined(ENABLE_MANAGED_USERS) |
| 975 // Initialization needs to happen after extension system initialization (for | 975 // Initialization needs to happen after extension system initialization (for |
| 976 // extension::ManagementPolicy) and InitProfileUserPrefs (for setting the | 976 // extension::ManagementPolicy) and InitProfileUserPrefs (for setting the |
| 977 // initializing the managed flag if necessary). | 977 // initializing the managed flag if necessary). |
| 978 ManagedUserServiceFactory::GetForProfile(profile)->Init(); | 978 ManagedUserServiceFactory::GetForProfile(profile)->Init(); |
| 979 #endif | 979 #endif |
| 980 // Start the deferred task runners once the profile is loaded. | 980 // Start the deferred task runners once the profile is loaded. |
| 981 StartupTaskRunnerServiceFactory::GetForProfile(profile)-> | 981 StartupTaskRunnerServiceFactory::GetForProfile(profile)-> |
| 982 StartDeferredTaskRunners(); | 982 StartDeferredTaskRunners(); |
| 983 | 983 |
| 984 AccountReconcilorFactory::GetForProfile(profile); | 984 if (switches::IsNewProfileManagement()) |
| 985 AccountReconcilorFactory::GetForProfile(profile); |
| 985 } | 986 } |
| 986 | 987 |
| 987 void ProfileManager::DoFinalInitLogging(Profile* profile) { | 988 void ProfileManager::DoFinalInitLogging(Profile* profile) { |
| 988 // Count number of extensions in this profile. | 989 // Count number of extensions in this profile. |
| 989 int enabled_app_count = -1; | 990 int enabled_app_count = -1; |
| 990 #if defined(ENABLE_EXTENSIONS) | 991 #if defined(ENABLE_EXTENSIONS) |
| 991 enabled_app_count = GetEnabledAppCount(profile); | 992 enabled_app_count = GetEnabledAppCount(profile); |
| 992 #endif | 993 #endif |
| 993 | 994 |
| 994 // Log the profile size after a reasonable startup delay. | 995 // Log the profile size after a reasonable startup delay. |
| (...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1279 last_non_managed_profile_path.BaseName().MaybeAsASCII()); | 1280 last_non_managed_profile_path.BaseName().MaybeAsASCII()); |
| 1280 FinishDeletingProfile(profile_to_delete_path); | 1281 FinishDeletingProfile(profile_to_delete_path); |
| 1281 } | 1282 } |
| 1282 } | 1283 } |
| 1283 } | 1284 } |
| 1284 #endif | 1285 #endif |
| 1285 | 1286 |
| 1286 ProfileManagerWithoutInit::ProfileManagerWithoutInit( | 1287 ProfileManagerWithoutInit::ProfileManagerWithoutInit( |
| 1287 const base::FilePath& user_data_dir) : ProfileManager(user_data_dir) { | 1288 const base::FilePath& user_data_dir) : ProfileManager(user_data_dir) { |
| 1288 } | 1289 } |
| OLD | NEW |