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_impl.h" | 5 #include "chrome/browser/profiles/profile_impl.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <memory> | 9 #include <memory> |
10 #include <utility> | 10 #include <utility> |
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
135 #include "chrome/browser/chromeos/profiles/profile_helper.h" | 135 #include "chrome/browser/chromeos/profiles/profile_helper.h" |
136 #include "chrome/browser/chromeos/settings/device_settings_service.h" | 136 #include "chrome/browser/chromeos/settings/device_settings_service.h" |
137 #include "components/user_manager/user_manager.h" | 137 #include "components/user_manager/user_manager.h" |
138 #endif | 138 #endif |
139 | 139 |
140 #if BUILDFLAG(ENABLE_BACKGROUND) | 140 #if BUILDFLAG(ENABLE_BACKGROUND) |
141 #include "chrome/browser/background/background_mode_manager.h" | 141 #include "chrome/browser/background/background_mode_manager.h" |
142 #endif | 142 #endif |
143 | 143 |
144 #if defined(OS_CHROMEOS) | 144 #if defined(OS_CHROMEOS) |
| 145 #include "chrome/browser/chromeos/authpolicy/auth_policy_credentials_manager.h" |
145 #include "chrome/browser/chromeos/login/session/user_session_manager.h" | 146 #include "chrome/browser/chromeos/login/session/user_session_manager.h" |
146 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h" | 147 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h" |
147 #include "chrome/browser/chromeos/policy/user_policy_manager_factory_chromeos.h" | 148 #include "chrome/browser/chromeos/policy/user_policy_manager_factory_chromeos.h" |
148 #else | 149 #else |
149 #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h" | 150 #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h" |
150 #include "components/policy/core/common/cloud/user_cloud_policy_manager.h" | 151 #include "components/policy/core/common/cloud/user_cloud_policy_manager.h" |
151 #endif | 152 #endif |
152 | 153 |
153 #if BUILDFLAG(ENABLE_EXTENSIONS) | 154 #if BUILDFLAG(ENABLE_EXTENSIONS) |
154 #include "chrome/browser/extensions/extension_service.h" | 155 #include "chrome/browser/extensions/extension_service.h" |
(...skipping 289 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
444 g_browser_process->browser_policy_connector(); | 445 g_browser_process->browser_policy_connector(); |
445 schema_registry_service_ = | 446 schema_registry_service_ = |
446 policy::SchemaRegistryServiceFactory::CreateForContext( | 447 policy::SchemaRegistryServiceFactory::CreateForContext( |
447 this, connector->GetChromeSchema(), connector->GetSchemaRegistry()); | 448 this, connector->GetChromeSchema(), connector->GetSchemaRegistry()); |
448 #if defined(OS_CHROMEOS) | 449 #if defined(OS_CHROMEOS) |
449 if (force_immediate_policy_load) | 450 if (force_immediate_policy_load) |
450 chromeos::DeviceSettingsService::Get()->LoadImmediately(); | 451 chromeos::DeviceSettingsService::Get()->LoadImmediately(); |
451 configuration_policy_provider_ = | 452 configuration_policy_provider_ = |
452 policy::UserPolicyManagerFactoryChromeOS::CreateForProfile( | 453 policy::UserPolicyManagerFactoryChromeOS::CreateForProfile( |
453 this, force_immediate_policy_load, sequenced_task_runner); | 454 this, force_immediate_policy_load, sequenced_task_runner); |
| 455 AuthPolicyCredentialsManagerFactory::BuildForProfileIfActiveDirectory(this); |
454 #else | 456 #else |
455 configuration_policy_provider_ = | 457 configuration_policy_provider_ = |
456 policy::UserCloudPolicyManagerFactory::CreateForOriginalBrowserContext( | 458 policy::UserCloudPolicyManagerFactory::CreateForOriginalBrowserContext( |
457 this, force_immediate_policy_load, sequenced_task_runner, | 459 this, force_immediate_policy_load, sequenced_task_runner, |
458 BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE), | 460 BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE), |
459 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)); | 461 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)); |
460 #endif | 462 #endif |
461 profile_policy_connector_ = | 463 profile_policy_connector_ = |
462 policy::ProfilePolicyConnectorFactory::CreateForBrowserContext( | 464 policy::ProfilePolicyConnectorFactory::CreateForBrowserContext( |
463 this, force_immediate_policy_load); | 465 this, force_immediate_policy_load); |
(...skipping 897 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1361 return std::unique_ptr<domain_reliability::DomainReliabilityMonitor>(); | 1363 return std::unique_ptr<domain_reliability::DomainReliabilityMonitor>(); |
1362 | 1364 |
1363 return service->CreateMonitor( | 1365 return service->CreateMonitor( |
1364 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)); | 1366 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)); |
1365 } | 1367 } |
1366 | 1368 |
1367 std::unique_ptr<service_manager::Service> ProfileImpl::CreateIdentityService() { | 1369 std::unique_ptr<service_manager::Service> ProfileImpl::CreateIdentityService() { |
1368 SigninManagerBase* signin_manager = SigninManagerFactory::GetForProfile(this); | 1370 SigninManagerBase* signin_manager = SigninManagerFactory::GetForProfile(this); |
1369 return base::MakeUnique<identity::IdentityService>(signin_manager); | 1371 return base::MakeUnique<identity::IdentityService>(signin_manager); |
1370 } | 1372 } |
OLD | NEW |