| 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 976 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 987 #if defined(ENABLE_MANAGED_USERS) | 987 #if defined(ENABLE_MANAGED_USERS) |
| 988 // Initialization needs to happen after extension system initialization (for | 988 // Initialization needs to happen after extension system initialization (for |
| 989 // extension::ManagementPolicy) and InitProfileUserPrefs (for setting the | 989 // extension::ManagementPolicy) and InitProfileUserPrefs (for setting the |
| 990 // initializing the managed flag if necessary). | 990 // initializing the managed flag if necessary). |
| 991 ManagedUserServiceFactory::GetForProfile(profile)->Init(); | 991 ManagedUserServiceFactory::GetForProfile(profile)->Init(); |
| 992 #endif | 992 #endif |
| 993 // Start the deferred task runners once the profile is loaded. | 993 // Start the deferred task runners once the profile is loaded. |
| 994 StartupTaskRunnerServiceFactory::GetForProfile(profile)-> | 994 StartupTaskRunnerServiceFactory::GetForProfile(profile)-> |
| 995 StartDeferredTaskRunners(); | 995 StartDeferredTaskRunners(); |
| 996 | 996 |
| 997 if (switches::IsNewProfileManagement()) | 997 AccountReconcilorFactory::GetForProfile(profile); |
| 998 AccountReconcilorFactory::GetForProfile(profile); | |
| 999 } | 998 } |
| 1000 | 999 |
| 1001 void ProfileManager::DoFinalInitLogging(Profile* profile) { | 1000 void ProfileManager::DoFinalInitLogging(Profile* profile) { |
| 1002 // Count number of extensions in this profile. | 1001 // Count number of extensions in this profile. |
| 1003 int enabled_app_count = -1; | 1002 int enabled_app_count = -1; |
| 1004 #if defined(ENABLE_EXTENSIONS) | 1003 #if defined(ENABLE_EXTENSIONS) |
| 1005 enabled_app_count = GetEnabledAppCount(profile); | 1004 enabled_app_count = GetEnabledAppCount(profile); |
| 1006 #endif | 1005 #endif |
| 1007 | 1006 |
| 1008 // Log the profile size after a reasonable startup delay. | 1007 // Log the profile size after a reasonable startup delay. |
| (...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1286 last_non_managed_profile_path.BaseName().MaybeAsASCII()); | 1285 last_non_managed_profile_path.BaseName().MaybeAsASCII()); |
| 1287 FinishDeletingProfile(profile_to_delete_path); | 1286 FinishDeletingProfile(profile_to_delete_path); |
| 1288 } | 1287 } |
| 1289 } | 1288 } |
| 1290 } | 1289 } |
| 1291 #endif | 1290 #endif |
| 1292 | 1291 |
| 1293 ProfileManagerWithoutInit::ProfileManagerWithoutInit( | 1292 ProfileManagerWithoutInit::ProfileManagerWithoutInit( |
| 1294 const base::FilePath& user_data_dir) : ProfileManager(user_data_dir) { | 1293 const base::FilePath& user_data_dir) : ProfileManager(user_data_dir) { |
| 1295 } | 1294 } |
| OLD | NEW |