| 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 399 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 410 policy::UserCloudPolicyManagerFactoryChromeOS::CreateForProfile( | 410 policy::UserCloudPolicyManagerFactoryChromeOS::CreateForProfile( |
| 411 this, force_immediate_policy_load); | 411 this, force_immediate_policy_load); |
| 412 #else | 412 #else |
| 413 cloud_policy_manager_ = | 413 cloud_policy_manager_ = |
| 414 policy::UserCloudPolicyManagerFactory::CreateForProfile( | 414 policy::UserCloudPolicyManagerFactory::CreateForProfile( |
| 415 this, force_immediate_policy_load); | 415 this, force_immediate_policy_load); |
| 416 #endif | 416 #endif |
| 417 #endif | 417 #endif |
| 418 profile_policy_connector_ = | 418 profile_policy_connector_ = |
| 419 policy::ProfilePolicyConnectorFactory::CreateForProfile( | 419 policy::ProfilePolicyConnectorFactory::CreateForProfile( |
| 420 this, force_immediate_policy_load, sequenced_task_runner); | 420 this, |
| 421 force_immediate_policy_load, |
| 422 sequenced_task_runner); |
| 421 | 423 |
| 422 DCHECK(create_mode == CREATE_MODE_ASYNCHRONOUS || | 424 DCHECK(create_mode == CREATE_MODE_ASYNCHRONOUS || |
| 423 create_mode == CREATE_MODE_SYNCHRONOUS); | 425 create_mode == CREATE_MODE_SYNCHRONOUS); |
| 424 bool async_prefs = create_mode == CREATE_MODE_ASYNCHRONOUS; | 426 bool async_prefs = create_mode == CREATE_MODE_ASYNCHRONOUS; |
| 425 | 427 |
| 426 #if defined(OS_CHROMEOS) | 428 #if defined(OS_CHROMEOS) |
| 427 is_login_profile_ = chromeos::ProfileHelper::IsSigninProfile(this); | 429 is_login_profile_ = chromeos::ProfileHelper::IsSigninProfile(this); |
| 428 if (is_login_profile_) | 430 if (is_login_profile_) |
| 429 chrome::RegisterLoginProfilePrefs(pref_registry_.get()); | 431 chrome::RegisterLoginProfilePrefs(pref_registry_.get()); |
| 430 else | 432 else |
| (...skipping 778 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1209 PrefProxyConfigTracker* ProfileImpl::CreateProxyConfigTracker() { | 1211 PrefProxyConfigTracker* ProfileImpl::CreateProxyConfigTracker() { |
| 1210 #if defined(OS_CHROMEOS) | 1212 #if defined(OS_CHROMEOS) |
| 1211 if (chromeos::ProfileHelper::IsSigninProfile(this)) { | 1213 if (chromeos::ProfileHelper::IsSigninProfile(this)) { |
| 1212 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( | 1214 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( |
| 1213 g_browser_process->local_state()); | 1215 g_browser_process->local_state()); |
| 1214 } | 1216 } |
| 1215 #endif // defined(OS_CHROMEOS) | 1217 #endif // defined(OS_CHROMEOS) |
| 1216 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( | 1218 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( |
| 1217 GetPrefs(), g_browser_process->local_state()); | 1219 GetPrefs(), g_browser_process->local_state()); |
| 1218 } | 1220 } |
| OLD | NEW |