| 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 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 67 | 67 |
| 68 #if defined(ENABLE_EXTENSIONS) | 68 #if defined(ENABLE_EXTENSIONS) |
| 69 #include "chrome/browser/extensions/extension_service.h" | 69 #include "chrome/browser/extensions/extension_service.h" |
| 70 #include "extensions/browser/extension_registry.h" | 70 #include "extensions/browser/extension_registry.h" |
| 71 #include "extensions/browser/extension_system.h" | 71 #include "extensions/browser/extension_system.h" |
| 72 #include "extensions/common/extension_set.h" | 72 #include "extensions/common/extension_set.h" |
| 73 #include "extensions/common/manifest.h" | 73 #include "extensions/common/manifest.h" |
| 74 #endif | 74 #endif |
| 75 | 75 |
| 76 #if defined(ENABLE_SUPERVISED_USERS) | 76 #if defined(ENABLE_SUPERVISED_USERS) |
| 77 #include "chrome/browser/supervised_user/child_accounts/child_account_service.h" |
| 78 #include "chrome/browser/supervised_user/child_accounts/child_account_service_fa
ctory.h" |
| 77 #include "chrome/browser/supervised_user/supervised_user_service.h" | 79 #include "chrome/browser/supervised_user/supervised_user_service.h" |
| 78 #include "chrome/browser/supervised_user/supervised_user_service_factory.h" | 80 #include "chrome/browser/supervised_user/supervised_user_service_factory.h" |
| 79 #endif | 81 #endif |
| 80 | 82 |
| 81 #if !defined(OS_IOS) | 83 #if !defined(OS_IOS) |
| 82 #include "chrome/browser/sessions/session_service_factory.h" | 84 #include "chrome/browser/sessions/session_service_factory.h" |
| 83 #include "chrome/browser/ui/browser_list.h" | 85 #include "chrome/browser/ui/browser_list.h" |
| 84 #endif // !defined (OS_IOS) | 86 #endif // !defined (OS_IOS) |
| 85 | 87 |
| 86 #if defined(OS_WIN) | 88 #if defined(OS_WIN) |
| (...skipping 925 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1012 extensions::ExtensionSystem::Get(profile) | 1014 extensions::ExtensionSystem::Get(profile) |
| 1013 ->extension_service() | 1015 ->extension_service() |
| 1014 ->BlockAllExtensions(); | 1016 ->BlockAllExtensions(); |
| 1015 } | 1017 } |
| 1016 | 1018 |
| 1017 #endif | 1019 #endif |
| 1018 #if defined(ENABLE_SUPERVISED_USERS) && !defined(OS_ANDROID) | 1020 #if defined(ENABLE_SUPERVISED_USERS) && !defined(OS_ANDROID) |
| 1019 // Initialization needs to happen after extension system initialization (for | 1021 // Initialization needs to happen after extension system initialization (for |
| 1020 // extension::ManagementPolicy) and InitProfileUserPrefs (for setting the | 1022 // extension::ManagementPolicy) and InitProfileUserPrefs (for setting the |
| 1021 // initializing the supervised flag if necessary). | 1023 // initializing the supervised flag if necessary). |
| 1024 ChildAccountServiceFactory::GetForProfile(profile)->Init(); |
| 1022 SupervisedUserServiceFactory::GetForProfile(profile)->Init(); | 1025 SupervisedUserServiceFactory::GetForProfile(profile)->Init(); |
| 1023 #endif | 1026 #endif |
| 1024 // Start the deferred task runners once the profile is loaded. | 1027 // Start the deferred task runners once the profile is loaded. |
| 1025 StartupTaskRunnerServiceFactory::GetForProfile(profile)-> | 1028 StartupTaskRunnerServiceFactory::GetForProfile(profile)-> |
| 1026 StartDeferredTaskRunners(); | 1029 StartDeferredTaskRunners(); |
| 1027 | 1030 |
| 1028 // Activate data reduction proxy. This creates a request context and makes a | 1031 // Activate data reduction proxy. This creates a request context and makes a |
| 1029 // URL request to check if the data reduction proxy server is reachable. | 1032 // URL request to check if the data reduction proxy server is reachable. |
| 1030 DataReductionProxyChromeSettingsFactory::GetForBrowserContext(profile)-> | 1033 DataReductionProxyChromeSettingsFactory::GetForBrowserContext(profile)-> |
| 1031 MaybeActivateDataReductionProxy(true); | 1034 MaybeActivateDataReductionProxy(true); |
| (...skipping 312 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1344 last_non_supervised_profile_path.BaseName().MaybeAsASCII()); | 1347 last_non_supervised_profile_path.BaseName().MaybeAsASCII()); |
| 1345 FinishDeletingProfile(profile_to_delete_path); | 1348 FinishDeletingProfile(profile_to_delete_path); |
| 1346 } | 1349 } |
| 1347 } | 1350 } |
| 1348 } | 1351 } |
| 1349 #endif | 1352 #endif |
| 1350 | 1353 |
| 1351 ProfileManagerWithoutInit::ProfileManagerWithoutInit( | 1354 ProfileManagerWithoutInit::ProfileManagerWithoutInit( |
| 1352 const base::FilePath& user_data_dir) : ProfileManager(user_data_dir) { | 1355 const base::FilePath& user_data_dir) : ProfileManager(user_data_dir) { |
| 1353 } | 1356 } |
| OLD | NEW |