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 "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/callback.h" | 8 #include "base/callback.h" |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
(...skipping 398 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
409 schema_registry_service_ = | 409 schema_registry_service_ = |
410 policy::SchemaRegistryServiceFactory::CreateForContext( | 410 policy::SchemaRegistryServiceFactory::CreateForContext( |
411 this, connector->GetChromeSchema(), connector->GetSchemaRegistry()); | 411 this, connector->GetChromeSchema(), connector->GetSchemaRegistry()); |
412 #if defined(OS_CHROMEOS) | 412 #if defined(OS_CHROMEOS) |
413 cloud_policy_manager_ = | 413 cloud_policy_manager_ = |
414 policy::UserCloudPolicyManagerFactoryChromeOS::CreateForProfile( | 414 policy::UserCloudPolicyManagerFactoryChromeOS::CreateForProfile( |
415 this, force_immediate_policy_load, sequenced_task_runner); | 415 this, force_immediate_policy_load, sequenced_task_runner); |
416 #else | 416 #else |
417 cloud_policy_manager_ = | 417 cloud_policy_manager_ = |
418 policy::UserCloudPolicyManagerFactory::CreateForOriginalBrowserContext( | 418 policy::UserCloudPolicyManagerFactory::CreateForOriginalBrowserContext( |
419 this, force_immediate_policy_load, sequenced_task_runner); | 419 this, |
| 420 force_immediate_policy_load, |
| 421 sequenced_task_runner, |
| 422 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE), |
| 423 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)); |
420 #endif | 424 #endif |
421 #endif | 425 #endif |
422 profile_policy_connector_ = | 426 profile_policy_connector_ = |
423 policy::ProfilePolicyConnectorFactory::CreateForProfile( | 427 policy::ProfilePolicyConnectorFactory::CreateForProfile( |
424 this, force_immediate_policy_load); | 428 this, force_immediate_policy_load); |
425 | 429 |
426 DCHECK(create_mode == CREATE_MODE_ASYNCHRONOUS || | 430 DCHECK(create_mode == CREATE_MODE_ASYNCHRONOUS || |
427 create_mode == CREATE_MODE_SYNCHRONOUS); | 431 create_mode == CREATE_MODE_SYNCHRONOUS); |
428 bool async_prefs = create_mode == CREATE_MODE_ASYNCHRONOUS; | 432 bool async_prefs = create_mode == CREATE_MODE_ASYNCHRONOUS; |
429 | 433 |
(...skipping 811 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1241 PrefProxyConfigTracker* ProfileImpl::CreateProxyConfigTracker() { | 1245 PrefProxyConfigTracker* ProfileImpl::CreateProxyConfigTracker() { |
1242 #if defined(OS_CHROMEOS) | 1246 #if defined(OS_CHROMEOS) |
1243 if (chromeos::ProfileHelper::IsSigninProfile(this)) { | 1247 if (chromeos::ProfileHelper::IsSigninProfile(this)) { |
1244 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( | 1248 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( |
1245 g_browser_process->local_state()); | 1249 g_browser_process->local_state()); |
1246 } | 1250 } |
1247 #endif // defined(OS_CHROMEOS) | 1251 #endif // defined(OS_CHROMEOS) |
1248 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( | 1252 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( |
1249 GetPrefs(), g_browser_process->local_state()); | 1253 GetPrefs(), g_browser_process->local_state()); |
1250 } | 1254 } |
OLD | NEW |