| 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 493 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 504 // Always create the cache directory asynchronously. | 504 // Always create the cache directory asynchronously. |
| 505 scoped_refptr<base::SequencedTaskRunner> sequenced_task_runner = | 505 scoped_refptr<base::SequencedTaskRunner> sequenced_task_runner = |
| 506 JsonPrefStore::GetTaskRunnerForFile(base_cache_path_, | 506 JsonPrefStore::GetTaskRunnerForFile(base_cache_path_, |
| 507 BrowserThread::GetBlockingPool()); | 507 BrowserThread::GetBlockingPool()); |
| 508 CreateProfileDirectory(sequenced_task_runner.get(), base_cache_path_); | 508 CreateProfileDirectory(sequenced_task_runner.get(), base_cache_path_); |
| 509 | 509 |
| 510 // Now that the profile is hooked up to receive pref change notifications to | 510 // Now that the profile is hooked up to receive pref change notifications to |
| 511 // kGoogleServicesUsername, initialize components that depend on it to reflect | 511 // kGoogleServicesUsername, initialize components that depend on it to reflect |
| 512 // the current value. | 512 // the current value. |
| 513 UpdateProfileUserNameCache(); | 513 UpdateProfileUserNameCache(); |
| 514 UpdateProfileIsEphemeralCache(); |
| 514 GAIAInfoUpdateServiceFactory::GetForProfile(this); | 515 GAIAInfoUpdateServiceFactory::GetForProfile(this); |
| 515 | 516 |
| 516 PrefService* local_state = g_browser_process->local_state(); | 517 PrefService* local_state = g_browser_process->local_state(); |
| 517 ssl_config_service_manager_.reset( | 518 ssl_config_service_manager_.reset( |
| 518 SSLConfigServiceManager::CreateDefaultManager(local_state)); | 519 SSLConfigServiceManager::CreateDefaultManager(local_state)); |
| 519 | 520 |
| 520 // Initialize the BackgroundModeManager - this has to be done here before | 521 // Initialize the BackgroundModeManager - this has to be done here before |
| 521 // InitExtensions() is called because it relies on receiving notifications | 522 // InitExtensions() is called because it relies on receiving notifications |
| 522 // when extensions are loaded. BackgroundModeManager is not needed under | 523 // when extensions are loaded. BackgroundModeManager is not needed under |
| 523 // ChromeOS because Chrome is always running, no need for special keep-alive | 524 // ChromeOS because Chrome is always running, no need for special keep-alive |
| (...skipping 717 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1241 PrefProxyConfigTracker* ProfileImpl::CreateProxyConfigTracker() { | 1242 PrefProxyConfigTracker* ProfileImpl::CreateProxyConfigTracker() { |
| 1242 #if defined(OS_CHROMEOS) | 1243 #if defined(OS_CHROMEOS) |
| 1243 if (chromeos::ProfileHelper::IsSigninProfile(this)) { | 1244 if (chromeos::ProfileHelper::IsSigninProfile(this)) { |
| 1244 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( | 1245 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( |
| 1245 g_browser_process->local_state()); | 1246 g_browser_process->local_state()); |
| 1246 } | 1247 } |
| 1247 #endif // defined(OS_CHROMEOS) | 1248 #endif // defined(OS_CHROMEOS) |
| 1248 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( | 1249 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( |
| 1249 GetPrefs(), g_browser_process->local_state()); | 1250 GetPrefs(), g_browser_process->local_state()); |
| 1250 } | 1251 } |
| OLD | NEW |