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 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
125 #include "printing/features/features.h" | 125 #include "printing/features/features.h" |
126 #include "services/identity/identity_service.h" | 126 #include "services/identity/identity_service.h" |
127 #include "services/identity/public/interfaces/constants.mojom.h" | 127 #include "services/identity/public/interfaces/constants.mojom.h" |
128 #include "services/preferences/public/cpp/pref_service_main.h" | 128 #include "services/preferences/public/cpp/pref_service_main.h" |
129 #include "services/preferences/public/interfaces/preferences.mojom.h" | 129 #include "services/preferences/public/interfaces/preferences.mojom.h" |
130 #include "services/preferences/public/interfaces/tracked_preference_validation_d
elegate.mojom.h" | 130 #include "services/preferences/public/interfaces/tracked_preference_validation_d
elegate.mojom.h" |
131 #include "services/service_manager/public/cpp/service.h" | 131 #include "services/service_manager/public/cpp/service.h" |
132 #include "ui/base/l10n/l10n_util.h" | 132 #include "ui/base/l10n/l10n_util.h" |
133 | 133 |
134 #if defined(OS_CHROMEOS) | 134 #if defined(OS_CHROMEOS) |
| 135 #include "chrome/browser/chromeos/authpolicy/auth_policy_credentials_manager.h" |
135 #include "chrome/browser/chromeos/locale_change_guard.h" | 136 #include "chrome/browser/chromeos/locale_change_guard.h" |
136 #include "chrome/browser/chromeos/login/session/user_session_manager.h" | 137 #include "chrome/browser/chromeos/login/session/user_session_manager.h" |
137 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h" | 138 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h" |
138 #include "chrome/browser/chromeos/policy/user_policy_manager_factory_chromeos.h" | 139 #include "chrome/browser/chromeos/policy/user_policy_manager_factory_chromeos.h" |
139 #include "chrome/browser/chromeos/preferences.h" | 140 #include "chrome/browser/chromeos/preferences.h" |
140 #include "chrome/browser/chromeos/profiles/profile_helper.h" | 141 #include "chrome/browser/chromeos/profiles/profile_helper.h" |
141 #include "chrome/browser/chromeos/settings/device_settings_service.h" | 142 #include "chrome/browser/chromeos/settings/device_settings_service.h" |
142 #include "components/session_manager/core/session_manager.h" | 143 #include "components/session_manager/core/session_manager.h" |
143 #include "components/user_manager/user.h" | 144 #include "components/user_manager/user.h" |
144 #include "components/user_manager/user_manager.h" | 145 #include "components/user_manager/user_manager.h" |
(...skipping 317 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
462 g_browser_process->browser_policy_connector(); | 463 g_browser_process->browser_policy_connector(); |
463 schema_registry_service_ = | 464 schema_registry_service_ = |
464 policy::SchemaRegistryServiceFactory::CreateForContext( | 465 policy::SchemaRegistryServiceFactory::CreateForContext( |
465 this, connector->GetChromeSchema(), connector->GetSchemaRegistry()); | 466 this, connector->GetChromeSchema(), connector->GetSchemaRegistry()); |
466 #if defined(OS_CHROMEOS) | 467 #if defined(OS_CHROMEOS) |
467 if (force_immediate_policy_load) | 468 if (force_immediate_policy_load) |
468 chromeos::DeviceSettingsService::Get()->LoadImmediately(); | 469 chromeos::DeviceSettingsService::Get()->LoadImmediately(); |
469 configuration_policy_provider_ = | 470 configuration_policy_provider_ = |
470 policy::UserPolicyManagerFactoryChromeOS::CreateForProfile( | 471 policy::UserPolicyManagerFactoryChromeOS::CreateForProfile( |
471 this, force_immediate_policy_load, sequenced_task_runner); | 472 this, force_immediate_policy_load, sequenced_task_runner); |
| 473 AuthPolicyCredentialsManagerFactory::BuildForProfileIfActiveDirectory(this); |
472 #else | 474 #else |
473 configuration_policy_provider_ = | 475 configuration_policy_provider_ = |
474 policy::UserCloudPolicyManagerFactory::CreateForOriginalBrowserContext( | 476 policy::UserCloudPolicyManagerFactory::CreateForOriginalBrowserContext( |
475 this, force_immediate_policy_load, sequenced_task_runner, | 477 this, force_immediate_policy_load, sequenced_task_runner, |
476 BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE), | 478 BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE), |
477 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)); | 479 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)); |
478 #endif | 480 #endif |
479 profile_policy_connector_ = | 481 profile_policy_connector_ = |
480 policy::ProfilePolicyConnectorFactory::CreateForBrowserContext( | 482 policy::ProfilePolicyConnectorFactory::CreateForBrowserContext( |
481 this, force_immediate_policy_load); | 483 this, force_immediate_policy_load); |
(...skipping 897 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1379 return std::unique_ptr<domain_reliability::DomainReliabilityMonitor>(); | 1381 return std::unique_ptr<domain_reliability::DomainReliabilityMonitor>(); |
1380 | 1382 |
1381 return service->CreateMonitor( | 1383 return service->CreateMonitor( |
1382 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)); | 1384 BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)); |
1383 } | 1385 } |
1384 | 1386 |
1385 std::unique_ptr<service_manager::Service> ProfileImpl::CreateIdentityService() { | 1387 std::unique_ptr<service_manager::Service> ProfileImpl::CreateIdentityService() { |
1386 SigninManagerBase* signin_manager = SigninManagerFactory::GetForProfile(this); | 1388 SigninManagerBase* signin_manager = SigninManagerFactory::GetForProfile(this); |
1387 return base::MakeUnique<identity::IdentityService>(signin_manager); | 1389 return base::MakeUnique<identity::IdentityService>(signin_manager); |
1388 } | 1390 } |
OLD | NEW |